From: Björn Jacke Date: Fri, 5 Feb 2021 11:47:01 +0000 (+0100) Subject: classicupgrade: treat old never expires value right X-Git-Tag: samba-4.12.12~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=237a51d926e1620dd185cd55c3d9dbfb443b44e8;p=thirdparty%2Fsamba.git classicupgrade: treat old never expires value right BUG: https://bugzilla.samba.org/show_bug.cgi?id=14624 Signed-off-by: Bjoern Jacke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Wed Feb 10 15:06:49 UTC 2021 on sn-devel-184 (cherry picked from commit df75d82c9de6977c466ee9f01886cb012a9c5fef) Autobuild-User(v4-12-test): Karolin Seeger Autobuild-Date(v4-12-test): Tue Feb 16 22:33:52 UTC 2021 on sn-devel-184 --- diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 8511bed2868..dff856a8d7c 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -74,7 +74,7 @@ def import_sam_policy(samdb, policy, logger): if 'maximum password age' in policy: max_pw_age_unix = policy['maximum password age'] - if max_pw_age_unix == -1 or max_pw_age_unix == 0: + if max_pw_age_unix == -1 or max_pw_age_unix == 0 or max_pw_age_unix == 0xFFFFFFFF: max_pw_age_nt = -0x8000000000000000 else: max_pw_age_nt = int(-max_pw_age_unix * (1e7))