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@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)

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 5b1636a577d73646ed39f18b19fbea7a7e568007..c73e3ae4c8668413db77e1a94c15fd5625052f4d 100644 (file)
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2546,6 +2546,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;
        }
@@ -5125,6 +5128,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;
        }