From b2002b67b809e847d78f8d52d0eae041be61e897 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 14 May 2018 11:06:13 +1200 Subject: [PATCH] samba-tool domain: Add --machinepass to common options Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- python/samba/netcmd/domain.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index e5db665a16b..ca85de18234 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -106,6 +106,8 @@ string_version_to_constant = { } common_provision_join_options = [ + Option("--machinepass", type="string", metavar="PASSWORD", + help="choose machine password (otherwise random)"), Option("--targetdir", metavar="DIR", help="Set target directory (where to store provision)", type=str), Option("--quiet", help="Be quiet", action="store_true"), @@ -216,8 +218,6 @@ class cmd_domain_provision(Command): help="choose admin password (otherwise random)"), Option("--krbtgtpass", type="string", metavar="PASSWORD", help="choose krbtgt password (otherwise random)"), - Option("--machinepass", type="string", metavar="PASSWORD", - help="choose machine password (otherwise random)"), Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"], help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " @@ -574,8 +574,6 @@ class cmd_domain_dcpromo(Command): Option("--domain-critical-only", help="only replicate critical domain objects", action="store_true"), - Option("--machinepass", type=str, metavar="PASSWORD", - help="choose machine password (otherwise random)"), Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"], help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " @@ -654,8 +652,6 @@ class cmd_domain_join(Command): Option("--domain-critical-only", help="only replicate critical domain objects", action="store_true"), - Option("--machinepass", type=str, metavar="PASSWORD", - help="choose machine password (otherwise random)"), Option("--adminpass", type="string", metavar="PASSWORD", help="choose adminstrator password when joining as a subdomain (otherwise random)"), Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", -- 2.34.1