From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 19 Apr 2012 00:42:05 +0000 (+1000)
Subject: s4-s3upgrade: Do not ever set a domain-wide maxPwdAge of 0
X-Git-Tag: samba-4.0.0alpha20~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2b7a9e2a23e395a06700dd0968f4916bde56cdf;p=thirdparty%2Fsamba.git

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
---

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index ab9d9374d58..62cba23af7c 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))