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

provision: Simplify handling of default for --server-role.

Browse Source 
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Apr 16 18:12:24 CEST 2012 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2012-04-15 23:36:54 +02:00
parent 8cd7cc33d9
commit 1e949f3cd1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/setup/provision
View File

@ -108,7 +108,8 @@ parser.add_option("--ldap-backend-type", type="choice", metavar="LDAP-BACKEND-TY
choices=["fedora-ds", "openldap"])
parser.add_option("--server-role", type="choice", metavar="ROLE",
choices=["domain controller", "dc", "member server", "member", "standalone"],
help="The server role (domain controller | dc | member server | member | standalone). Default is dc.")
help="The server role (domain controller | dc | member server | member | standalone). Default is dc.",
default="domain controller")
parser.add_option("--function-level", type="choice", metavar="FOR-FUN-LEVEL",
choices=["2000", "2003", "2008", "2008_R2"],
help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2003 Native.",
@ -196,11 +197,6 @@ if not opts.adminpass:
lp = sambaopts.get_loadparm()
smbconf = lp.configfile
server_role = opts.server_role
if server_role is None:
server_role = "domain controller"
if opts.function_level == "2000":
dom_for_fun_level = DS_DOMAIN_FUNCTION_2000
elif opts.function_level == "2003":
@ -254,10 +250,10 @@ try:
ntdsguid=opts.ntds_guid,
invocationid=opts.invocationid, adminpass=opts.adminpass,
krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
dns_backend=dns_backend,
dns_backend=opts.dns_backend,
dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,
wheel=opts.wheel, users=opts.users,
serverrole=server_role, dom_for_fun_level=dom_for_fun_level,
serverrole=opts.server_role, dom_for_fun_level=dom_for_fun_level,
backend_type=opts.ldap_backend_type,
ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path,