Attachment 13374 Details for Bug 12840 – patch from master for 4.7, 4.6 and 4.5

[patch] patch from master for 4.7, 4.6 and 4.5

fruit.patch.v2 (text/plain), 3.60 KB, created by Guenther Deschner on 2017-07-13 10:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2017-07-13 10:32:13 UTC

Size: 3.60 KB

patch

obsolete

>From 40cfe92ae730b77e3801378cec96b0df1fee5099 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Wed, 28 Jun 2017 18:10:28 +0200
>Subject: [PATCH] vfs_fruit: add fruit:model = <modelname> parametric option
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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)
>---
> docs-xml/manpages/vfs_fruit.8.xml | 9 +++++++++
> source3/modules/vfs_fruit.c       | 6 +++++-
> source4/torture/vfs/fruit.c       | 8 +++++++-
> 3 files changed, 21 insertions(+), 2 deletions(-)
>
>diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml
>index 0bddd4a..1637a77 100644
>--- a/docs-xml/manpages/vfs_fruit.8.xml
>+++ b/docs-xml/manpages/vfs_fruit.8.xml
>@@ -160,6 +160,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>
> 
>diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
>index b49ee1c..3482d4e 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -138,6 +138,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,
>@@ -1628,6 +1629,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);
>@@ -2272,7 +2276,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;
>diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
>index 2ab153a..c78c906 100644
>--- a/source4/torture/vfs/fruit.c
>+++ b/source4/torture/vfs/fruit.c
>@@ -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);
>-- 
>2.9.4
>

Flags:

slow: review+

Actions: View

Attachments on bug 12840: 13273 | 13373 | 13374