diff options
| author | Aaron Haslett <aaronhaslett@catalyst.net.nz> | 2019-01-15 11:19:54 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-06-26 04:12:34 +0000 |
| commit | cb16395ab3809379c6af4ff9a97fae191ba30375 (patch) | |
| tree | e2f24528da528baedfa2a1a73ad6225e9c39689b | |
| parent | fc9845da69cabcc1bf046d7899b2c4aeae743170 (diff) | |
| download | samba-cb16395ab3809379c6af4ff9a97fae191ba30375.tar.gz | |
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>
| -rw-r--r-- | WHATSNEW.txt | 6 | ||||
| -rw-r--r-- | python/samba/netcmd/domain.py | 4 | ||||
| -rw-r--r-- | python/samba/provision/__init__.py | 2 | ||||
| -rw-r--r-- | python/samba/schema.py | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index c10c1d4ad1e..3a5d978d6ee 100644 --- 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 b616dba3438..1835de74230 100644 --- 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 14ab41be670..3d7e23cf077 100644 --- 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 b6c37bbd2df..aedee82bb8f 100644 --- 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): |