diff options
| author | Stefan Metzmacher <metze@samba.org> | 2023-03-18 16:00:14 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2023-03-22 22:10:32 +0000 |
| commit | e855fe206810e48181cb3431a80840bf618d5f16 (patch) | |
| tree | 68ff27d642a4283d6d4b1f806253185a5d3267c7 /testprogs | |
| parent | 1e024f6568ec03f7361a941ba7f3d7fb5801a30e (diff) | |
| download | samba-e855fe206810e48181cb3431a80840bf618d5f16.tar.gz | |
python/samba: let get_domain_descriptor() include adprep 2016 ACEs
We need to make sure a new provision as well as dbcheck
--reset-well-known-acls include acls used by adprep 2016,
otherwise we would undo the adprep result.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/dbcheck-oldrelease.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh index afd2d1247ce..b3450f75f20 100755 --- a/testprogs/blackbox/dbcheck-oldrelease.sh +++ b/testprogs/blackbox/dbcheck-oldrelease.sh @@ -408,14 +408,10 @@ dbcheck_clean() } # This should 'fail', because it returns the number of modified records. -# We don't need to run this against 4.1 releases +# We need to run this against all versions without adprep 2016 (before Samba 4.19) dbcheck_acl_reset() { - if [ x$RELEASE = x"release-4-0-0" -o x$RELEASE = x"alpha13" ]; 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 + $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" } # But having fixed it all up, this should pass. # We don't need to run this against 4.1.0rc3 |