sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

s4:provision: only print the adminpass if it was generated (not user-provided)

Browse Source
This commit is contained in:
Michael Adam 2012-02-16 12:06:34 +01:00
parent 09b865b2f0
commit 8ca39dfbe1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/provision/__init__.py
View File

@ -1744,6 +1744,9 @@ def provision(logger, session_info, credentials, smbconf=None,
if adminpass is None: if adminpass is None:
adminpass = samba.generate_random_password(12, 32) adminpass = samba.generate_random_password(12, 32)
adminpass_generated = True
else:
adminpass_generated = False
if samdb_fill == FILL_FULL: if samdb_fill == FILL_FULL:
provision_fill(samdb, secrets_ldb, logger, provision_fill(samdb, secrets_ldb, logger,
@ -1799,6 +1802,7 @@ def provision(logger, session_info, credentials, smbconf=None,
logger.info("DNS Domain: %s" % names.dnsdomain) logger.info("DNS Domain: %s" % names.dnsdomain)
logger.info("DOMAIN SID: %s" % str(domainsid)) logger.info("DOMAIN SID: %s" % str(domainsid))
if samdb_fill == FILL_FULL: if samdb_fill == FILL_FULL:
if adminpass_generated:
logger.info("Admin password: %s" % adminpass) logger.info("Admin password: %s" % adminpass)
if provision_backend.type is not "ldb": if provision_backend.type is not "ldb":
if provision_backend.credentials.get_bind_dn() is not None: if provision_backend.credentials.get_bind_dn() is not None: