summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-09-09 09:56:58 +1200
committerStefan Metzmacher <metze@samba.org>2013-09-16 19:37:12 +0200
commit1d92d5b19b36ddf15a70e3110caabfe06ba78619 (patch)
tree571e634d227e2f0a3ca63ccc2222ebf2402c73c2
parent84dc9f8cc17d49bef5b9c37fd818c7599bf5897a (diff)
downloadsamba-1d92d5b19b36ddf15a70e3110caabfe06ba78619.tar.gz
samba-1d92d5b19b36ddf15a70e3110caabfe06ba78619.tar.bz2
samba-1d92d5b19b36ddf15a70e3110caabfe06ba78619.zip
samba-tool domian join: Only print adminpass warning on subdomain creation
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--python/samba/netcmd/domain.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 134d93f442..e7269c6523 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -584,6 +584,9 @@ class cmd_domain_join(Command):
machinepass=machinepass, use_ntvfs=use_ntvfs,
dns_backend=dns_backend)
elif role == "SUBDOMAIN":
+ if not adminpass:
+ logger.info("Administrator password will be set randomly!")
+
netbios_domain = lp.get("workgroup")
if parent_domain is None:
parent_domain = ".".join(domain.split(".")[1:])