provision: Change the default functional level of new Samba domains to 2008R2.
authorAndrew Bartlett <abartlet@samba.org>
Wed, 24 Sep 2014 18:01:18 +0000 (11:01 -0700)
committerStefan Metzmacher <metze@samba.org>
Tue, 30 Sep 2014 10:32:05 +0000 (12:32 +0200)
Windows 2003 is going out of support shortly, and we want users to have AES by default

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
python/samba/netcmd/domain.py
python/samba/provision/__init__.py
testprogs/blackbox/upgradeprovision-oldrelease.sh

index fe34f9434b8b967f4fafd15d2904e771483fb98a..9dfbc391bca94b90bfe0758d281e9b2bf857f849 100644 (file)
@@ -205,8 +205,8 @@ class cmd_domain_provision(Command):
                 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) 2003 Native.",
-                default="2003"),
+                help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2008R2 Native.",
+                default="2008_R2"),
          Option("--next-rid", type="int", metavar="NEXTRID", default=1000,
                 help="The initial nextRid value (only needed for upgrades).  Default is 1000."),
          Option("--partitions-only",
index ca80e42058da555ad4708ad8bcc353791f8a234f..1603321bd8b526c1086037136c6d7bba4a0a2183 100644 (file)
@@ -1245,7 +1245,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
     domainControllerFunctionality = DS_DOMAIN_FUNCTION_2008_R2
 
     if dom_for_fun_level is None:
-        dom_for_fun_level = DS_DOMAIN_FUNCTION_2003
+        dom_for_fun_level = DS_DOMAIN_FUNCTION_2008_R2
 
     if dom_for_fun_level > domainControllerFunctionality:
         raise ProvisioningError("You want to run SAMBA 4 on a domain and forest function level which itself is higher than its actual DC function level (2008_R2). This won't work!")
index 3cb792933414d25ade2283f20254bbf2d7cf6743..26807be22c3c2a008972be93ca48770ff4f32dee 100755 (executable)
@@ -91,7 +91,7 @@ samba_upgradedns() {
 }
 
 referenceprovision() {
-        $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_upgrade_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1
+        $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_upgrade_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003
 }
 
 ldapcmp() {