summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/dbcheck-oldrelease.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
index fd66375d15..e536e84230 100755
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
@@ -37,13 +37,21 @@ dbcheck_clean() {
$PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@
}
-# This should 'fail', because it returns the number of modified records
+# This should 'fail', because it returns the number of modified records.
+# We don't need to run this against 4.1.0rc3
dbcheck_acl_reset() {
+ if [ x$RELEASE != x"release-4-1-0rc3" ]; then
$PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@
+ else
+ return 1
+ fi
}
-# But having fixed it all up, this should pass
+# But having fixed it all up, this should pass.
+# We don't need to run this against 4.1.0rc3
dbcheck_acl_reset_clean() {
+ if [ x$RELEASE != x"release-4-1-0rc3" ]; then
$PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@
+ fi
}
referenceprovision() {