From fbdb5fcc2e759177cedd8dbd0c779cef8598cf21 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 26 Jan 2017 11:49:55 +0100 Subject: [PATCH] vfs_fruit: checks wrong AAPL config state and so always uses readdirattr readdirattr should only be enabled if the client enables it via AAPL negotitiation, not for all clients when vfs_fruit is loaded. Unfortunately the check in fruit_readdir_attr() is if (!config->use_aapl) { return SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data); } This uses the wrong config state "use_aapl" which is always true by default (config option "fruit:aapl"). We must use "nego_aapl" instead which is only true if the client really negotiated this feature. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12541 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Jan 28 01:49:11 CET 2017 on sn-devel-144 (cherry picked from commit 9a3b64a24cc21124485b423c9b70b67ff5a96f10) --- source3/modules/vfs_fruit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 89e9412..ecd150e 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -3496,7 +3496,7 @@ static NTSTATUS fruit_readdir_attr(struct vfs_handle_struct *handle, struct fruit_config_data, return NT_STATUS_UNSUCCESSFUL); - if (!config->use_aapl) { + if (!config->nego_aapl) { return SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data); } -- 2.9.3