From d3d89f754b0cb08efa3632d2c0f841b3cbab4188 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 21 Nov 2007 00:27:50 -0500
Subject: Use same tzinfo as the time parser to avoid TypeError from being
 thrown

---
 ipa-server/ipa-gui/ipagui/helpers/userhelper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipa-server/ipa-gui/ipagui/helpers/userhelper.py b/ipa-server/ipa-gui/ipagui/helpers/userhelper.py
index e1ade3a2..52d37c9e 100644
--- a/ipa-server/ipa-gui/ipagui/helpers/userhelper.py
+++ b/ipa-server/ipa-gui/ipagui/helpers/userhelper.py
@@ -13,7 +13,7 @@ def password_expires_in(datestr):
     if not expdate:
         return sys.maxint
 
-    delta = expdate - datetime.datetime.now()
+    delta = expdate - datetime.datetime.now(ipautil.GeneralizedTimeZone())
     return delta.days
 
 def password_is_expired(days):
-- 
cgit