summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-04 14:02:35 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-04 14:02:35 +1100
commit952bdffaadebe8fc147c69da160ddd83e1d03245 (patch)
tree32e6df795e5d635aa74638d639a3d7d9ae220ca0
parent44c94b6c66b00807d58233550cf8915566cb97d0 (diff)
downloadsamba-952bdffaadebe8fc147c69da160ddd83e1d03245.tar.gz
samba-952bdffaadebe8fc147c69da160ddd83e1d03245.tar.bz2
samba-952bdffaadebe8fc147c69da160ddd83e1d03245.zip
Don't print the admin password if we don't set one.
For example, if we don't create the admin user (perhaps expecting users to be in LDAP already, or we are due an incoming replication) we should not confuse the administrator by printing a unused password. Andrew Bartlett
-rw-r--r--source4/scripting/python/samba/provision.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0aa84ec6db..d96857661e 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1136,7 +1136,8 @@ def provision(setup_dir, message, session_info,
message("NetBIOS Domain: %s" % names.domain)
message("DNS Domain: %s" % names.dnsdomain)
message("DOMAIN SID: %s" % str(domainsid))
- message("Admin password: %s" % adminpass)
+ if samdb_fill == FILL_FULL:
+ message("Admin password: %s" % adminpass)
result = ProvisionResult()
result.domaindn = domaindn