s4:domain functional level - it is also specified in the domain object under partitions

Discovered by the "ldapcmp" tool

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index fa2dabe5d476aac6593f78ebd7ef9a88b67aba2d..f7db2e7bb8cdd98714457306394ef77c721b8ce4 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -976,7 +976,8 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp,
             "SCHEMADN": names.schemadn,
             "DOMAINDN": names.domaindn,
             "SERVERDN": names.serverdn,
-            "FOREST_FUNCTIONALALITY": str(forestFunctionality)
+            "FOREST_FUNCTIONALALITY": str(forestFunctionality),
+            "DOMAIN_FUNCTIONALITY": str(domainFunctionality)
             })
 
         message("Setting up display specifiers")

diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index e6e9b3fd50be8b316b5f42db87c9cd887a321038..b913eba702db61e5408d4cf2668d876e0fafad06 100644 (file)
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -1039,6 +1039,7 @@ dn: CN=${DOMAIN},CN=Partitions,${CONFIGDN}
 objectClass: top
 objectClass: crossRef
 dnsRoot: ${DNSDOMAIN}
+msDS-Behavior-Version: ${DOMAIN_FUNCTIONALITY}
 nCName: ${DOMAINDN}
 nETBIOSName: ${DOMAIN}
 nTMixedDomain: 0