sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

vfs_fruit: fix fruit:resource option spelling

Browse Source 
Fix all occurences of bad spelling of "resource" as "res*s*ource" (two
s).

One of the places where this was wrong was when parsing parametric
options in the VFS connect() function in the module. As a result any
setting of

  fruit:resource=something

in smb.conf was silently ignored and the default ("file") was active.

In Samba 4.6 we accept both the wrong and the correct spelling, in Samba
4.7 the bad spelling will be removed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12412

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2016-11-08 12:35:12 +01:00 committed by Jeremy Allison
parent 682300ce0a
commit 7d4b4a4299
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs-xml/manpages/vfs_fruit.8.xml
View File

@ -86,7 +86,13 @@
<varlistentry>
<term>fruit:resource = [ file | xattr | stream ]</term>
<listitem>
<para>Controls where the OS X resource fork is stored:</para>
<para>Controls where the OS X resource fork is stored.</para>
<para>Due to a spelling bug in all Samba versions older then
4.6.0, this option can also be given as
<emphasis>fruit:ressource</emphasis>, ie with two s.</para>
<para>Settings:</para>
<itemizedlist>
<listitem><para><command>file (default)</command> - use a ._

2
selftest/target/Samba3.pm
View File

@ -1648,7 +1648,7 @@ sub provision($$$$$$$$)
path = $shrdir
vfs objects = catia fruit streams_xattr acl_xattr
ea support = yes
fruit:ressource = file
fruit:resource = file
fruit:metadata = netatalk
fruit:locking = netatalk
fruit:encoding = native

2
selftest/target/Samba4.pm
View File

@ -937,7 +937,7 @@ sub provision($$$$$$$$$$)
path = $ctx->{share}
vfs objects = catia fruit streams_xattr acl_xattr
ea support = yes
fruit:ressource = file
fruit:resource = file
fruit:metadata = netatalk
fruit:locking = netatalk
fruit:encoding = native

31
source3/modules/vfs_fruit.c
View File

@ -68,7 +68,7 @@
*
* The AFP_Resource stream is stored in an AppleDouble file prepending
* "._" to the filename. On Solaris with ZFS the stream is optionally
* stored in an EA "org.netatalk.ressource".
* stored in an EA "org.netatalk.resource".
*
*
* Extended Attributes
@ -378,7 +378,7 @@ struct ad_entry_order entry_order_meta_xattr[ADEID_NUM_XATTR + 1] = {
{0, 0, 0}
};
/* AppleDouble ressource fork file (the ones prefixed by "._") */
/* AppleDouble resource fork file (the ones prefixed by "._") */
static const
struct ad_entry_order entry_order_dot_und[ADEID_NUM_DOT_UND + 1] = {
{ADEID_FINDERI, ADEDOFF_FINDERI_DOT_UND, ADEDLEN_FINDERI},
@ -387,8 +387,8 @@ struct ad_entry_order entry_order_dot_und[ADEID_NUM_DOT_UND + 1] = {
};
/*
* Fake AppleDouble entry oder for ressource fork xattr. The xattr
* isn't an AppleDouble file, it simply contains the ressource data,
* Fake AppleDouble entry oder for resource fork xattr. The xattr
* isn't an AppleDouble file, it simply contains the resource data,
* but in order to be able to use some API calls like ad_getentryoff()
* we build a fake/helper struct adouble with this entry order struct.
*/
@ -926,7 +926,7 @@ static ssize_t ad_header_read_rsrc(struct adouble *ad, const char *path)
/* Now parse entries */
ok = ad_unpack(ad, ADEID_NUM_DOT_UND, sbuf.st_ex_size);
if (!ok) {
DEBUG(1, ("invalid AppleDouble ressource %s\n", path));
DEBUG(1, ("invalid AppleDouble resource %s\n", path));
errno = EINVAL;
rc = -1;
goto exit;
@ -938,7 +938,7 @@ static ssize_t ad_header_read_rsrc(struct adouble *ad, const char *path)
< ADEDLEN_FINDERI)
|| (ad_getentryoff(ad, ADEID_RFORK)
< ADEDOFF_RFORK_DOT_UND)) {
DEBUG(2, ("invalid AppleDouble ressource %s\n", path));
DEBUG(2, ("invalid AppleDouble resource %s\n", path));
errno = EINVAL;
rc = -1;
goto exit;
@ -1309,10 +1309,27 @@ static int init_fruit_config(vfs_handle_struct *handle)
return -1;
}
/*
* Versions up to Samba 4.5.x had a spelling bug in the
* fruit:resource option calling lp_parm_enum with
* "res*s*ource" (ie two s).
*
* In Samba 4.6 we accept both the wrong and the correct
* spelling, in Samba 4.7 the bad spelling will be removed.
*/
enumval = lp_parm_enum(SNUM(handle->conn), FRUIT_PARAM_TYPE_NAME,
"ressource", fruit_rsrc, FRUIT_RSRC_ADFILE);
if (enumval == -1) {
DEBUG(1, ("value for %s: ressource type unknown\n",
DEBUG(1, ("value for %s: resource type unknown\n",
FRUIT_PARAM_TYPE_NAME));
return -1;
}
config->rsrc = (enum fruit_rsrc)enumval;
enumval = lp_parm_enum(SNUM(handle->conn), FRUIT_PARAM_TYPE_NAME,
"resource", fruit_rsrc, enumval);
if (enumval == -1) {
DEBUG(1, ("value for %s: resource type unknown\n",
FRUIT_PARAM_TYPE_NAME));
return -1;
}