s4:provision: use generate_random_password()

metze

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index e2ee8d053fe52e42690de4835bf325ca546b153b..1d58f5e2c91cbcba95de2813a222a1c0997461a2 100755 (executable)
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -875,7 +875,7 @@ def update_machine_account_password(paths,creds,session,names):
                assert(len(res) == 1)
 
                msg = ldb.Message(res[0].dn)
-               machinepass = glue.generate_random_str(12)
+               machinepass = glue.generate_random_password(128, 255)
                msg["userPassword"] = ldb.MessageElement(machinepass, ldb.FLAG_MOD_REPLACE, "userPassword")
                sam_ldb.modify(msg)
 

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index def91f36517375cf224f662ccdcf6ce59b5b11db..dfd47b79623f4a8ee8545c5b54362db8135d433a 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1149,16 +1149,16 @@ def provision(setup_dir, message, session_info,
     policyguid_dc = policyguid_dc.upper()
 
     if adminpass is None:
-        adminpass = glue.generate_random_str(12)
+        adminpass = glue.generate_random_password(12, 32)
     if krbtgtpass is None:
-        krbtgtpass = glue.generate_random_str(12)
+        krbtgtpass = glue.generate_random_password(128, 255)
     if machinepass is None:
-        machinepass  = glue.generate_random_str(12)
+        machinepass  = glue.generate_random_password(128, 255)
     if dnspass is None:
-        dnspass = glue.generate_random_str(12)
+        dnspass = glue.generate_random_password(128, 255)
     if ldapadminpass is None:
         #Make a new, random password between Samba and it's LDAP server
-        ldapadminpass=glue.generate_random_str(12)        
+        ldapadminpass=glue.generate_random_password(128, 255)
 
     if backend_type is None:
         backend_type = "ldb"