[PATCH] vfs_fruit shouldn't send MS NFS ACEs to Windows clients

[Ralph Böhme]

Hi!

Attached is a fix for bug 12897.

The MS NFS ACEs feature was enabled in vfs_fruit for all connected clients,
regardless if they actually requested this feature by means of AAPL create
context negotiation.

Please review&push if ok. Thanks!

Cheerio!
-slow
-------------- next part --------------
From a76a6745ffbfadb4ee2d9a778de2684f1ed764b9 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow at samba.org>
Date: Wed, 12 Jul 2017 09:33:59 +0200
Subject: [PATCH] vfs_fruit: don't use MS NFS ACEs with Windows clients

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

Signed-off-by: Ralph Boehme <slow at samba.org>
---
 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 3482d4e..7c481cd 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2606,6 +2606,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;
 	}
@@ -5280,6 +5283,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