s4:provision - Change the default forest/domain function level back to Windows 2003...

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 3fb6ed641c1a3cbde5f7f87701d8a7e1d2294e24..45a4062c02df1a0dd95f887738a725bd09075317 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -938,7 +938,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
     domainControllerFunctionality = DS_DC_FUNCTION_2008
 
     if dom_for_fun_level is None:
-        dom_for_fun_level = DS_DOMAIN_FUNCTION_2008
+        dom_for_fun_level = DS_DOMAIN_FUNCTION_2003
     if dom_for_fun_level < DS_DOMAIN_FUNCTION_2003:
         raise ProvisioningError("You want to run SAMBA 4 on a domain and forest function level lower than Windows 2003 (Native). This isn't supported!")
 

diff --git a/source4/setup/provision b/source4/setup/provision
index 9912138fa371f521ddb5859d914ae76270752c96..1cfcfc7137c3d7b05034a860291feeef2b814d04 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -96,7 +96,7 @@ parser.add_option("--server-role", type="choice", metavar="ROLE",
                help="The server role (domain controller | dc | member server | member | standalone). Default is standalone.")
 parser.add_option("--function-level", type="choice", metavar="FOR-FUN-LEVEL",
                  choices=["2003", "2008", "2008_R2"],
-               help="The domain and forest function level (2003 | 2008 | 2008_R2). Default is (Windows) 2008 (Native).")
+               help="The domain and forest function level (2003 | 2008 | 2008_R2). Default is (Windows) 2003 (Native).")
 parser.add_option("--partitions-only", 
                help="Configure Samba's partitions, but do not modify them (ie, join a BDC)", action="store_true")
 parser.add_option("--targetdir", type="string", metavar="DIR",