summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-11-16 16:51:06 +1100
committerAmitay Isaacs <amitay@gmail.com>2011-11-18 14:38:27 +1100
commite80dbdcab1831bd07e76863acaea4e356f71cf98 (patch)
tree5644def6e1b923ec12a031fe31354f2c1c11413f /source4
parent32e825d60df26fa1d4cf5c8c7cb37ca0523847ca (diff)
downloadsamba-e80dbdcab1831bd07e76863acaea4e356f71cf98.tar.gz
samba-e80dbdcab1831bd07e76863acaea4e356f71cf98.tar.bz2
samba-e80dbdcab1831bd07e76863acaea4e356f71cf98.zip
s4-s3-upgrade now look for -1 as the special 'not set' value
this is possible because we know the py_passdb will always set -1 here, not passing though 0xFFFFFFFF. Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 0636d2bac5..c58364bcfe 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -65,7 +65,7 @@ def import_sam_policy(samdb, policy, logger):
'minPwdAge')
max_pw_age_unix = policy['maximum password age']
- if (max_pw_age_unix == 0xFFFFFFFF):
+ if (max_pw_age_unix == -1):
max_pw_age_nt = 0
else:
max_pw_age_nt = unix2nttime(max_pw_age_unix)