]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
selftest: add "fruit:veto_appledouble = no" to fruit shares
authorRalph Boehme <slow@samba.org>
Fri, 17 Nov 2017 12:52:25 +0000 (13:52 +0100)
committerKarolin Seeger <kseeger@samba.org>
Tue, 5 Dec 2017 09:32:11 +0000 (10:32 +0100)
This is needed for a subsequent commit that modifies an existing test to
write a ._ file over SMB instead of using the ugly local creation hack.

SMB acces of ._ files requires "fruit:veto_appledouble = no", so let's
set it.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13155

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(backported from commit 3f9b45a410384904d64bdd0d68ff2a5bc25bd3e9)

selftest/target/Samba3.pm
source4/torture/vfs/fruit.c

index 66ac1e1f45ff0a9cab905c6a77e8c9347a3ec337..dbfad1ccab4efccb464c1f640c6de0ab6b0a30dd 100755 (executable)
@@ -1789,6 +1789,7 @@ sub provision($$$$$$$$)
        fruit:metadata = netatalk
        fruit:locking = netatalk
        fruit:encoding = native
+       fruit:veto_appledouble = no
 
 [vfs_fruit_metadata_stream]
        path = $shrdir
@@ -1796,6 +1797,7 @@ sub provision($$$$$$$$)
        ea support = yes
        fruit:resource = file
        fruit:metadata = stream
+       fruit:veto_appledouble = no
 
 [vfs_fruit_stream_depot]
        path = $shrdir
@@ -1803,6 +1805,7 @@ sub provision($$$$$$$$)
        ea support = yes
        fruit:resource = stream
        fruit:metadata = stream
+       fruit:veto_appledouble = no
 
 [vfs_wo_fruit]
        path = $shrdir
index c30096c18321bbb1f608fc5f15091121cf111d8d..c78fd83377c27c27ff912161a853e4b088b71fb4 100644 (file)
@@ -4009,6 +4009,9 @@ static bool test_readdir_attr_illegal_ntfs(struct torture_context *tctx,
 
                if (!strcmp(found, ".") || !strcmp(found, ".."))
                        continue;
+               if (strncmp(found, "._", 2) == 0) {
+                       continue;
+               }
                break;
        }