From 460dd7c20408958dda1ca8e77050e9af334b558f Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 9 Jan 2013 05:02:21 +0900
Subject: fix from_login

---
 src/leap/eip/checks.py         | 3 ---
 src/leap/gui/firstrun/login.py | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

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
 
-- 
cgit v1.2.3