sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3:test_larg_acl: adapt for the canonical ACE flags format

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-04-18 11:52:29 +12:00 committed by Andrew Bartlett
parent 75a089dc46
commit 82b3281fff
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/knownfail.d/sddl-sid-misc
View File

@ -109,5 +109,3 @@
^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdSysvolTestCase.test_ntvfs_check.ad_dc:local
^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdSysvolTestCase.test_s3fs_check.ad_dc:local
^samba.tests.samba_tool.ntacl.samba.tests.samba_tool.ntacl.NtACLCmdSysvolTestCase.test_with_missing_files.ad_dc:local
^samba3.blackbox.large_acl.NT1.able.to.retrieve.a.large.ACL.if.VFS.supports.it.fileserver_smb1_done
^samba3.blackbox.large_acl.SMB3.able.to.retrieve.a.large.ACL.if.VFS.supports.it.fileserver

7
source3/script/tests/test_large_acl.sh
View File

@ -44,10 +44,13 @@ test_large_acl()
{
#An ACL with 200 entries, ~7K
new_acl=$(seq 1001 1200 | sed -r -e '1 i\D:(A;;0x001f01ff;;;WD)' -e 's/(.*)/(A;;0x001f01ff;;;S-1-5-21-11111111-22222222-33333333-\1)/' | tr -d '\n')
# the ace flags will lose their 0x00 padding when reserialised from the SD.
new_acl_out=$(echo -n "$new_acl" | perl -p -e 's/0x00/0x/g')
$SMBCACLS //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD --sddl -S $new_acl large_acl
actual_acl=$($SMBCACLS //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD --sddl --numeric large_acl 2>/dev/null | sed -rn 's/.*(D:.*)/\1/p' | tr -d '\n')
if [ ! "$new_acl" = "$actual_acl" ]; then
echo -e "expected:\n$new_acl\nactual:\n$actual_acl\n"
if [ ! "$new_acl_out" = "$actual_acl" ]; then
echo -e "given:\n$new_acl\n"
echo -e "expected:\n$new_acl_out\nactual:\n$actual_acl\n"
return 1
fi
}