sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

samba-tool domain: Spit out common options between dcpromo and join

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:49:23 +12:00
parent f55eab600f
commit 72e18d671c
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,21 @@ common_provision_join_options = [
Option("--quiet", help="Be quiet", action="store_true"), Option("--quiet", help="Be quiet", action="store_true"),
] ]
common_join_options = [
Option("--server", help="DC to join", type=str),
Option("--site", help="site to join", type=str),
Option("--domain-critical-only",
help="only replicate critical domain objects",
action="store_true"),
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), "
"BIND9_DLZ uses samba4 AD to store zone information, "
"NONE skips the DNS setup entirely (this DC will not be a DNS server)",
default="SAMBA_INTERNAL"),
Option("--verbose", help="Be verbose", action="store_true")
]
common_ntvfs_options = [ common_ntvfs_options = [
Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)", Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)",
action="store_true") action="store_true")
@ -573,20 +588,8 @@ class cmd_domain_dcpromo(Command):
"credopts": options.CredentialsOptions, "credopts": options.CredentialsOptions,
} }
takes_options = [ takes_options = []
Option("--server", help="DC to join", type=str), takes_options.extend(common_join_options)
Option("--site", help="site to join", type=str),
Option("--domain-critical-only",
help="only replicate critical domain objects",
action="store_true"),
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), "
"BIND9_DLZ uses samba4 AD to store zone information, "
"NONE skips the DNS setup entirely (this DC will not be a DNS server)",
default="SAMBA_INTERNAL"),
Option("--verbose", help="Be verbose", action="store_true")
]
takes_options.extend(common_provision_join_options) takes_options.extend(common_provision_join_options)
@ -650,27 +653,16 @@ class cmd_domain_join(Command):
} }
takes_options = [ takes_options = [
Option("--server", help="DC to join", type=str),
Option("--site", help="site to join", type=str),
Option("--parent-domain", help="parent domain to create subdomain under", type=str), Option("--parent-domain", help="parent domain to create subdomain under", type=str),
Option("--domain-critical-only",
help="only replicate critical domain objects",
action="store_true"),
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",
choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"],
help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), "
"BIND9_DLZ uses samba4 AD to store zone information, "
"NONE skips the DNS setup entirely (this DC will not be a DNS server)",
default="SAMBA_INTERNAL"),
Option("--verbose", help="Be verbose", action="store_true")
] ]
ntvfs_options = [ ntvfs_options = [
Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)", Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)",
action="store_true") action="store_true")
] ]
takes_options.extend(common_join_options)
takes_options.extend(common_provision_join_options) takes_options.extend(common_provision_join_options)
if samba.is_ntvfs_fileserver_built(): if samba.is_ntvfs_fileserver_built():