s3:test_larg_acl: adapt for the canonical ACE flags format

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/knownfail.d/sddl-sid-misc b/selftest/knownfail.d/sddl-sid-misc
index 66fbc24a29f1f304271e5cdb8aebad48fc1e3d02..b886f6bdd0ccf089c842049d2a1c4a1ee0735202 100644 (file)
--- a/selftest/knownfail.d/sddl-sid-misc
+++ b/selftest/knownfail.d/sddl-sid-misc
@@ -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

diff --git a/source3/script/tests/test_large_acl.sh b/source3/script/tests/test_large_acl.sh
index b80034a1438fc981ab1310f95d52e1ca978b675a..b80b15ec094ff7746f0b412c750592aad792e6c9 100755 (executable)
--- a/source3/script/tests/test_large_acl.sh
+++ b/source3/script/tests/test_large_acl.sh
@@ -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
 }