From a2b7a9e2a23e395a06700dd0968f4916bde56cdf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 19 Apr 2012 10:42:05 +1000 Subject: s4-s3upgrade: Do not ever set a domain-wide maxPwdAge of 0 This means no-expiry in s3, and so we must treat it like -1. Andrew Bartlett --- source4/scripting/python/samba/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index ab9d9374d5..62cba23af7 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 == -1: + if max_pw_age_unix == -1 || max_pw_age_unix == 0: max_pw_age_nt = -0x8000000000000000 else: max_pw_age_nt = int(-max_pw_age_unix * (1e7 * 60 * 60 * 24)) -- cgit