From dba33c9ec9ba83f716002cc562168ddde3bcb6b6 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 17 Nov 2017 13:52:25 +0100 Subject: [PATCH] selftest: add "fruit:veto_appledouble = no" to fruit shares 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 Reviewed-by: Jeremy Allison (backported from commit 3f9b45a410384904d64bdd0d68ff2a5bc25bd3e9) --- selftest/target/Samba3.pm | 3 +++ source4/torture/vfs/fruit.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 66ac1e1f45f..dbfad1ccab4 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -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 diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c index c30096c1832..c78fd83377c 100644 --- a/source4/torture/vfs/fruit.c +++ b/source4/torture/vfs/fruit.c @@ -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; } -- 2.47.2