diff options
| author | Karolin Seeger <kseeger@samba.org> | 2017-01-27 05:37:20 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-01-27 09:48:52 +0100 |
| commit | 4387d85db3c9e4508b49ebe61534c696b93638b5 (patch) | |
| tree | 93452cd9e4c4a94f568bed3e81185c19a559ad1c /selftest | |
| parent | 415864f39ea407304811569b0aaa459c966d87be (diff) | |
| download | samba-4387d85db3c9e4508b49ebe61534c696b93638b5.tar.gz | |
Revert "vfs_fruit: fix fruit:resource option spelling, but not behaviour"
This reverts commit 586f8b73b6c189cb825ce2e8817230ca57f87d35.
This patchset slipped in by accident and is not in master yet.
The commit message does not fit to the set of patches, because numerous patches
have been squashed into one commit. It's a rewrite of vfs_fruit.
Reverting until review will be finished and patches are in master.
Autobuild-User(v4-5-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-5-test): Fri Jan 27 09:48:52 CET 2017 on sn-devel-144
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba3.pm | 26 | ||||
| -rwxr-xr-x | selftest/target/Samba4.pm | 2 |
2 files changed, 2 insertions, 26 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 9a06733bb1d..8f2a1f534a0 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1610,35 +1610,11 @@ sub provision($$$$$$$$) path = $shrdir vfs objects = catia fruit streams_xattr acl_xattr ea support = yes - fruit:resource = file + fruit:ressource = file fruit:metadata = netatalk fruit:locking = netatalk fruit:encoding = native -[vfs_fruit_metadata_stream] - path = $shrdir - vfs objects = fruit streams_xattr acl_xattr - ea support = yes - fruit:resource = file - fruit:metadata = stream - -[vfs_fruit_stream_depot] - path = $shrdir - vfs objects = fruit streams_depot acl_xattr - ea support = yes - fruit:resource = stream - fruit:metadata = stream - -[vfs_wo_fruit] - path = $shrdir - vfs objects = streams_xattr acl_xattr - ea support = yes - -[vfs_wo_fruit_stream_depot] - path = $shrdir - vfs objects = streams_depot acl_xattr - ea support = yes - [badname-tmp] path = $badnames_shrdir guest ok = yes diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index ffa104fae5a..f1de4b9c8eb 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -910,7 +910,7 @@ sub provision($$$$$$$$$$) path = $ctx->{share} vfs objects = catia fruit streams_xattr acl_xattr ea support = yes - fruit:resource = file + fruit:ressource = file fruit:metadata = netatalk fruit:locking = netatalk fruit:encoding = native |