summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-06 16:41:18 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-05-06 14:49:39 +0200
commitc2b094ffbc8ace231ed53175c1c694539e3d2e2c (patch)
treedde269d8f7b48658e1355e2ce9ac88843275fca2 /source4/scripting
parentdb11c1b12018b0f92672d07fcf15c3b404f923d3 (diff)
downloadsamba-c2b094ffbc8ace231ed53175c1c694539e3d2e2c.tar.gz
samba-c2b094ffbc8ace231ed53175c1c694539e3d2e2c.tar.bz2
samba-c2b094ffbc8ace231ed53175c1c694539e3d2e2c.zip
s4-s3-upgrade: Max/min password age policy is in seconds, not days
This cases upgraded domains to have a too-long password expiry, which in extreme cases can cause the KDC to misfunction. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun May 6 14:49:39 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 7d6930681f..7055d0d673 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -60,7 +60,7 @@ def import_sam_policy(samdb, policy, logger):
ldb.FLAG_MOD_REPLACE, 'pwdHistoryLength')
min_pw_age_unix = policy['minimum password age']
- min_pw_age_nt = int(-min_pw_age_unix * (1e7 * 60 * 60 * 24))
+ min_pw_age_nt = int(-min_pw_age_unix * (1e7))
m['a03'] = ldb.MessageElement(str(min_pw_age_nt), ldb.FLAG_MOD_REPLACE,
'minPwdAge')
@@ -68,7 +68,7 @@ def import_sam_policy(samdb, policy, logger):
if max_pw_age_unix == -1 or max_pw_age_unix == 0:
max_pw_age_nt = -0x8000000000000000
else:
- max_pw_age_nt = int(-max_pw_age_unix * (1e7 * 60 * 60 * 24))
+ max_pw_age_nt = int(-max_pw_age_unix * (1e7))
m['a04'] = ldb.MessageElement(str(max_pw_age_nt), ldb.FLAG_MOD_REPLACE,
'maxPwdAge')