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

diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index de278399b142f68ec68feec6ec37a4ded752891a..39ecf86094b925dd95b8f8c85a46f2b2642b0b27 100644 (file)
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -2317,7 +2317,7 @@ static PyObject *py_pdb_get_account_policy(pytalloc_Object *self)
                type = account_policy_name_to_typenum(names[i]);
                status = methods->get_account_policy(methods, type, &value);
                if (NT_STATUS_IS_OK(status)) {
-                       PyDict_SetItemString(py_acct_policy, names[i], PyInt_FromLong(value));
+                       PyDict_SetItemString(py_acct_policy, names[i], Py_BuildValue("i", value));
                }
        }
 

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 0636d2bac59dc95283566124b3b5cf69acf11b03..c58364bcfe059475cc87c1b91fcb9b25b38c6b86 100644 (file)
--- 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)