From 8519f98677dd28b8ed4091bf266652b870cff4a8 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Wed, 16 Aug 2017 16:02:32 +1200 Subject: [PATCH] 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 Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett --- source4/setup/adprep/fix-forest-rev.ldf | 6 ++++++ source4/setup/provision_configuration.ldif | 2 +- testprogs/blackbox/upgradeprovision-oldrelease.sh | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 source4/setup/adprep/fix-forest-rev.ldf diff --git a/source4/setup/adprep/fix-forest-rev.ldf b/source4/setup/adprep/fix-forest-rev.ldf new file mode 100644 index 0000000000..b4458e6cbd --- /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 b3b45b2ad0..53c9c8536d 100644 --- 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 a297bc3d8a..4f6b4e91a5 100755 --- 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() { -- 2.34.1