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

vfs_fruit: add fruit:model = <modelname> parametric option

Browse Source 
fruit:model = iMac
fruit:model = MacBook
fruit:model = MacPro
fruit:model = Xserve

will all display a different icon inside Finder.

Formerly, we used "Samba" which resulted in a "?" icon in Finder, with
the new default "MacSamba" we appear with a computer box icon at least.

Guenther

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

Signed-off-by: Guenther Deschner <gd@samba.org>
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Wed Jul 12 03:17:57 CEST 2017 on sn-devel-144

(cherry picked from commit 259e1706e3206b215e136ea9d5beef4c9e3fcdee)
This commit is contained in:
Günther Deschner 2017-06-28 18:10:28 +02:00 committed by Karolin Seeger
parent 1ec8c4ab07
commit 1714d0cfa2
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,15 @@
</listitem>
</varlistentry>
<varlistentry>
<term>fruit:model = MacSamba</term>
<listitem>
<para>This option defines the model string inside the AAPL
extension and will determine the appearance of the icon representing the
Samba server in the Finder window.</para>
<para>The default is <emphasis>MacSamba</emphasis>.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>

6
source3/modules/vfs_fruit.c
View File

@ -136,6 +136,7 @@ struct fruit_config_data {
bool veto_appledouble;
bool posix_rename;
bool aapl_zero_file_id;
const char *model;
/*
* Additional options, all enabled by default,
@ -1604,6 +1605,9 @@ static int init_fruit_config(vfs_handle_struct *handle)
config->readdir_attr_max_access = lp_parm_bool(
SNUM(handle->conn), "readdir_attr", "aapl_max_access", true);
config->model = lp_parm_const_string(
-1, FRUIT_PARAM_TYPE_NAME, "model", "MacSamba");
SMB_VFS_HANDLE_SET_DATA(handle, config,
NULL, struct fruit_config_data,
return -1);
@ -2227,7 +2231,7 @@ static NTSTATUS check_aapl(vfs_handle_struct *handle,
if (req_bitmap & SMB2_CRTCTX_AAPL_MODEL_INFO) {
ok = convert_string_talloc(req,
CH_UNIX, CH_UTF16LE,
"Samba", strlen("Samba"),
config->model, strlen(config->model),
&model, &modellen);
if (!ok) {
return NT_STATUS_UNSUCCESSFUL;

8
source4/torture/vfs/fruit.c
View File

@ -1252,7 +1252,13 @@ static bool enable_aapl(struct torture_context *tctx,
torture_assert_goto(tctx, aapl != NULL, ret, done, "missing AAPL context");
if (!is_osx_server) {
torture_assert_goto(tctx, aapl->data.length == 50, ret, done, "bad AAPL size");
size_t exptected_aapl_ctx_size;
exptected_aapl_ctx_size = strlen("MacSamba") * 2 + 40;
torture_assert_goto(
tctx, aapl->data.length == exptected_aapl_ctx_size,
ret, done, "bad AAPL size");
}
aapl_server_caps = BVAL(aapl->data.data, 16);