From 1d92d5b19b36ddf15a70e3110caabfe06ba78619 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 Sep 2013 09:56:58 +1200 Subject: samba-tool domian join: Only print adminpass warning on subdomain creation Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- python/samba/netcmd/domain.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'python') 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:]) -- cgit