sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

samba-tool domain: Add --machinepass to common options

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2018-05-14 11:06:13 +12:00
parent 5ba0f55e9a
commit b2002b67b8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/samba/netcmd/domain.py
View File

@ -106,6 +106,8 @@ string_version_to_constant = {
} }
common_provision_join_options = [ common_provision_join_options = [
Option("--machinepass", type="string", metavar="PASSWORD",
help="choose machine password (otherwise random)"),
Option("--targetdir", metavar="DIR", Option("--targetdir", metavar="DIR",
help="Set target directory (where to store provision)", type=str), help="Set target directory (where to store provision)", type=str),
Option("--quiet", help="Be quiet", action="store_true"), Option("--quiet", help="Be quiet", action="store_true"),
@ -216,8 +218,6 @@ class cmd_domain_provision(Command):
help="choose admin password (otherwise random)"), help="choose admin password (otherwise random)"),
Option("--krbtgtpass", type="string", metavar="PASSWORD", Option("--krbtgtpass", type="string", metavar="PASSWORD",
help="choose krbtgt password (otherwise random)"), 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", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"], choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"],
help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " 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", Option("--domain-critical-only",
help="only replicate critical domain objects", help="only replicate critical domain objects",
action="store_true"), action="store_true"),
Option("--machinepass", type=str, metavar="PASSWORD",
help="choose machine password (otherwise random)"),
Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"], choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"],
help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " 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", Option("--domain-critical-only",
help="only replicate critical domain objects", help="only replicate critical domain objects",
action="store_true"), action="store_true"),
Option("--machinepass", type=str, metavar="PASSWORD",
help="choose machine password (otherwise random)"),
Option("--adminpass", type="string", metavar="PASSWORD", Option("--adminpass", type="string", metavar="PASSWORD",
help="choose adminstrator password when joining as a subdomain (otherwise random)"), help="choose adminstrator password when joining as a subdomain (otherwise random)"),
Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",