provision: RODC revision level should be at 2

This number had been mistakenly updated alongside the standard forest
updates revision. This version number appears to be independent of the
other revision levels.

Also add the change to a new .ldf file, which can be used to apply
the schema change to an existing Samba 4.7 (or earlier) instance.
Update the provision/upgrade test to do just this (otherwise it
complains about differences between a new provision and an older Samba
4.0.0 instance).

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/setup/adprep/fix-forest-rev.ldf b/source4/setup/adprep/fix-forest-rev.ldf
new file mode 100644 (file)
index 0000000..b4458e6
--- /dev/null
+++ b/source4/setup/adprep/fix-forest-rev.ldf
@@ -0,0 +1,6 @@
+dn: CN=ActiveDirectoryRodcUpdate,CN=ForestUpdates,CN=Configuration,DC=X
+changetype: modify
+replace: revision
+revision: 2
+-
+

diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index b3b45b2ad01c86e2d4e68e4bfc086c884dc2c903..53c9c8536de4dc5db48f4f21056a1496e9318a1e 100644 (file)
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -33,7 +33,7 @@ nTSecurityDescriptor:: ${FORESTUPDATES_DESCRIPTOR}
 dn: CN=ActiveDirectoryRodcUpdate,CN=ForestUpdates,${CONFIGDN}
 objectClass: top
 objectClass: container
-revision: 5
+revision: 2
 
 dn: CN=ActiveDirectoryUpdate,CN=ForestUpdates,${CONFIGDN}
 objectClass: top

diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh
index a297bc3d8a78678be6cc7569c9a6f3f541fe35fa..4f6b4e91a5e5575dadc93ac1f4ef63ea9f9e1932 100755 (executable)
--- a/testprogs/blackbox/upgradeprovision-oldrelease.sh
+++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh
@@ -83,7 +83,7 @@ upgradeprovision() {
        $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX_ABS/${RELEASE}_upgrade/etc/smb.conf" --debugchange
 
        # on top of this, also apply 2008R2 changes we accidentally missed in the past
-       $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif
+       $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf
 }
 
 upgradeprovision_full() {