schema: changing default base schema to 2012_R2

Changing default base schema from 2008_R2 to 2012_R2

Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c10c1d4ad1ebae6c9962ba214270331c2cdfa83c..3a5d978d6eebb19f61e91577614ff092c43c31b1 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -82,7 +82,13 @@ Log lines are of the form:
     durations are in microseconds.
 
 
+Default schema updated to 2012_R2
+-------------------------
 
+Default AD schema changed from 2008_R2 to 2012_R2.  2012_R2 functional level
+is not yet available.  Older schemas can be used by provisioning with the
+'--base-schema' argument.  Existing installations can be updated with the
+samba-tool command "domain schemaupgrade".
 
 
 REMOVED FEATURES

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index b616dba3438697661dcc09e277c0378d5e75eb23..1835de742307119b6fc4dc007d5abb68dad6ab72 100644 (file)
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -277,8 +277,8 @@ class cmd_domain_provision(Command):
                default="2008_R2"),
         Option("--base-schema", type="choice", metavar="BASE-SCHEMA",
                choices=["2008_R2", "2008_R2_old", "2012", "2012_R2"],
-               help="The base schema files to use. Default is (Windows) 2008_R2.",
-               default="2008_R2"),
+               help="The base schema files to use. Default is (Windows) 2012_R2.",
+               default="2012_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",

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 14ab41be67005ce9e4e4a6fbd1b0cfce605c971a..3d7e23cf07743ec57f68a2c22556a73de10064e6 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -2138,7 +2138,7 @@ def provision(logger, session_info, smbconf=None,
               useeadb=False, am_rodc=False, lp=None, use_ntvfs=False,
               use_rfc2307=False, maxuid=None, maxgid=None, skip_sysvolacl=True,
               ldap_backend_forced_uri=None, nosync=False, ldap_dryrun_mode=False,
-              ldap_backend_extra_port=None, base_schema=None,
+              ldap_backend_extra_port=None, base_schema="2012_R2",
               plaintext_secrets=False, backend_store=None):
     """Provision samba4
 

diff --git a/python/samba/schema.py b/python/samba/schema.py
index b6c37bbd2dfa3969ce597cbb82d3dcc476de10af..aedee82bb8fa439aee476d1e2c9ab90e58880da7 100644 (file)
--- a/python/samba/schema.py
+++ b/python/samba/schema.py
@@ -147,7 +147,7 @@ class Schema(object):
     @staticmethod
     def default_base_schema():
         """Returns the default base schema to use"""
-        return "2008_R2"
+        return "2012_R2"
 
     @staticmethod
     def get_version(base_schema):