>From d5ce8d2545731f825a18b094eb86992b24dddd75 Mon Sep 17 00:00:00 2001 From: Rowland Penny Date: Thu, 2 Jun 2016 15:41:51 +0100 Subject: [PATCH] samba-tool domain provision, remove unused server roles. Signed-off-by: Rowland Penny --- python/samba/netcmd/domain.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 68775ec..584e9fb 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -219,10 +219,6 @@ class cmd_domain_provision(Command): Option("--ldap-backend-type", type="choice", metavar="LDAP-BACKEND-TYPE", help="Test initialisation support for unsupported LDAP backend type (fedora-ds or openldap) DO NOT USE", choices=["fedora-ds", "openldap"]), - 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.", - default="domain controller"), 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) 2008_R2 Native.", @@ -287,7 +283,6 @@ class cmd_domain_provision(Command): quiet=None, blank=None, ldap_backend_type=None, - server_role=None, function_level=None, next_rid=None, partitions_only=None, @@ -321,6 +316,8 @@ class cmd_domain_provision(Command): if len(self.raw_argv) == 1: interactive = True + server_role = "dc" + if interactive: from getpass import getpass import socket @@ -348,8 +345,6 @@ class cmd_domain_provision(Command): if domain is None: raise CommandError("No domain set!") - server_role = ask("Server Role (dc, member, standalone)", "dc") - dns_backend = ask("DNS backend (SAMBA_INTERNAL, BIND9_FLATFILE, BIND9_DLZ, NONE)", "SAMBA_INTERNAL") if dns_backend in (None, ''): raise CommandError("No DNS backend set!") -- 1.7.10.4