diff options
| author | Ralph Boehme <slow@samba.org> | 2017-01-19 09:30:45 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-03-06 12:26:19 +0100 |
| commit | 0915fd4e840311ae45a71f71e14462314a27240a (patch) | |
| tree | ce30329ce7886c01686a6cd54965dbaec7519ccf | |
| parent | 38d02860abb382e792deaab7e4d0c74a7bfd10a8 (diff) | |
| download | samba-0915fd4e840311ae45a71f71e14462314a27240a.tar.gz | |
vfs_fruit: only veto AppleDouble files with fruit:resource=file
vfs_fruit only creates AppleDouble files itself when "fruit:resource" is
set to "file" (the default). It is only then the these AppleDouble files
should be treated as an internal representation and should be
inaccessible from clients.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12526>
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
(cherry picked from commit 708767da8c366c021d6d15a3ae71d009357c3320)
| -rw-r--r-- | docs-xml/manpages/vfs_fruit.8.xml | 12 | ||||
| -rw-r--r-- | source3/modules/vfs_fruit.c | 9 |
2 files changed, 14 insertions, 7 deletions
diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml index 0f4d94163f7..966bf10630b 100644 --- a/docs-xml/manpages/vfs_fruit.8.xml +++ b/docs-xml/manpages/vfs_fruit.8.xml @@ -223,10 +223,14 @@ <varlistentry> <term>fruit:veto_appledouble = yes | no</term> <listitem> - <para>Whether ._ AppleDouble files are vetoed which - prevents the client from seing and accessing internal - AppleDouble files created by vfs_fruit itself for the - purpose of storing a Mac resource fork.</para> + <para><emphasis>Note:</emphasis> this option only applies when + <parameter>fruit:resource</parameter> is set to + <parameter>file</parameter> (the default).</para> + + <para>When <parameter>fruit:resource</parameter> is set to + <parameter>file</parameter>, vfs_fruit may create ._ AppleDouble + files. This options controls whether these ._ AppleDouble files + are vetoed which prevents the client from accessing them.</para> <para>Vetoing ._ files may break some applications, eg extracting Mac ZIP archives from Mac clients failes, because they contain ._ files. Setting this option to diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index ecd150e1bc7..10334ff845e 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -1343,9 +1343,12 @@ static int init_fruit_config(vfs_handle_struct *handle) } config->encoding = (enum fruit_encoding)enumval; - config->veto_appledouble = lp_parm_bool( - SNUM(handle->conn), FRUIT_PARAM_TYPE_NAME, - "veto_appledouble", true); + if (config->rsrc == FRUIT_RSRC_ADFILE) { + config->veto_appledouble = lp_parm_bool(SNUM(handle->conn), + FRUIT_PARAM_TYPE_NAME, + "veto_appledouble", + true); + } config->use_aapl = lp_parm_bool( -1, FRUIT_PARAM_TYPE_NAME, "aapl", true); |