diff options
| author | kali <kali@leap.se> | 2013-01-09 05:02:21 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-09 05:02:21 +0900 |
| commit | 460dd7c20408958dda1ca8e77050e9af334b558f (patch) | |
| tree | 2fc60a84dbf91fbac0395239a7ecf70580943ec2 | |
| parent | 93d5a8cd1ec55c725d5931d86989ea11ac2db844 (diff) | |
fix from_login
| -rw-r--r-- | src/leap/eip/checks.py | 3 | ||||
| -rw-r--r-- | src/leap/gui/firstrun/login.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index 9ae6e5f5..a002e2d9 100644 --- a/src/leap/eip/checks.py +++ b/src/leap/eip/checks.py @@ -276,10 +276,7 @@ class ProviderCertChecker(object): cert = gnutls.crypto.X509Certificate(cert_s) from_ = time.gmtime(cert.activation_time) to_ = time.gmtime(cert.expiration_time) - # FIXME BUG ON LEAP_CLI, certs are not valid on gmtime - # See #1153 return from_ < now() < to_ - #return now() < to_ def is_valid_pemfile(self, cert_s=None): """ diff --git a/src/leap/gui/firstrun/login.py b/src/leap/gui/firstrun/login.py index e7afee9f..6bf0605d 100644 --- a/src/leap/gui/firstrun/login.py +++ b/src/leap/gui/firstrun/login.py @@ -108,7 +108,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn): # InlineValidationPage # page here as a mean to catch # srp authentication errors while wizard = self.wizard() - eipconfigchecker = wizard.eipconfigchecker() + eipconfigchecker = wizard.eipconfigchecker(domain=domain) ######################## # 1) try name resolution @@ -321,6 +321,7 @@ class LogInPage(InlineValidationPage, UserFormMixIn): # InlineValidationPage self.setField('provider_domain', domain) self.setField('login_userName', username) self.setField('login_userPassword', password) + self.wizard().from_login = True return True |