Attachment 13385 Details for Bug 12897 – Patch for 4.5, 4.6 and 4.7 cherry-picked from master

[patch] Patch for 4.5, 4.6 and 4.7 cherry-picked from master

bug12897-v45,v46,v47.patch (text/plain), 1.45 KB, created by Ralph Böhme on 2017-07-14 13:47:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-07-14 13:47:06 UTC

Size: 1.45 KB

patch

obsolete

>From c63e14f9e851ad01fd323109dbe5b2aff83c25cc Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Wed, 12 Jul 2017 09:33:59 +0200
>Subject: [PATCH] vfs_fruit: don't use MS NFS ACEs with Windows clients
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12897
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Thu Jul 13 22:21:08 CEST 2017 on sn-devel-144
>
>(cherry picked from commit df0db9d8f893f9245c6289200303b94a6e2d48d0)
>---
> source3/modules/vfs_fruit.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
>index b49ee1c..64e631a 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -2602,6 +2602,9 @@ static NTSTATUS check_ms_nfs(vfs_handle_struct *handle,
> 				struct fruit_config_data,
> 				return NT_STATUS_UNSUCCESSFUL);
> 
>+	if (!global_fruit_config.nego_aapl) {
>+		return NT_STATUS_OK;
>+	}
> 	if (psd->dacl == NULL || !config->unix_info_enabled) {
> 		return NT_STATUS_OK;
> 	}
>@@ -5276,6 +5279,9 @@ static NTSTATUS fruit_fget_nt_acl(vfs_handle_struct *handle,
> 	/*
> 	 * Add MS NFS style ACEs with uid, gid and mode
> 	 */
>+	if (!global_fruit_config.nego_aapl) {
>+		return NT_STATUS_OK;
>+	}
> 	if (!config->unix_info_enabled) {
> 		return NT_STATUS_OK;
> 	}
>-- 
>2.9.4
>

Flags:

gd: review+

Actions: View

Attachments on bug 12897: 13385