From 8519f98677dd28b8ed4091bf266652b870cff4a8 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Wed, 16 Aug 2017 16:02:32 +1200 Subject: 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 --- testprogs/blackbox/upgradeprovision-oldrelease.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testprogs') diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh index a297bc3d8a7..4f6b4e91a5e 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() { -- cgit v1.2.1