diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-12-22 09:28:05 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-01-10 16:55:23 +0100 |
| commit | 051a1a9c6417c2cbffa7d091ae477a6c7922d363 (patch) | |
| tree | b9dd75b82a3e75be11ce0a5ea5d9ee061edeceb0 | |
| parent | 5e0fcb04a48d96669ed4376bfa17f679e3582236 (diff) | |
| download | samba-051a1a9c6417c2cbffa7d091ae477a6c7922d363.tar.gz samba-051a1a9c6417c2cbffa7d091ae477a6c7922d363.tar.bz2 samba-051a1a9c6417c2cbffa7d091ae477a6c7922d363.zip | |
samba-tool classicupgrade: Do not print the admin password during upgrade
This changes the code to only set and show a new password if no admin
user is found during the upgrade.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Jan 10 16:55:23 CET 2013 on sn-devel-104
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index df9415e762..d680a7ca23 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -35,6 +35,7 @@ from samba.credentials import Credentials from samba import dsdb from samba.ndr import ndr_pack from samba import unix2nttime +from samba import generate_random_password def import_sam_policy(samdb, policy, logger): @@ -835,11 +836,19 @@ Please fix this account before attempting to upgrade again if not (serverrole == "ROLE_DOMAIN_BDC" or serverrole == "ROLE_DOMAIN_PDC"): dns_backend = "NONE" + # If we found an admin user, set a fake pw that we will override. + # This avoids us printing out an admin password that we won't actually + # set. + if admin_user: + adminpass = generate_random_password(12, 32) + else: + adminpass = None + # Do full provision result = provision(logger, session_info, None, targetdir=targetdir, realm=realm, domain=domainname, domainsid=str(domainsid), next_rid=next_rid, - dc_rid=machinerid, + dc_rid=machinerid, adminpass = adminpass, dom_for_fun_level=dsdb.DS_DOMAIN_FUNCTION_2003, hostname=netbiosname.lower(), machinepass=machinepass, serverrole=serverrole, samdb_fill=FILL_FULL, |