From: Ralph Boehme Date: Thu, 26 Jan 2017 10:49:55 +0000 (+0100) Subject: vfs_fruit: checks wrong AAPL config state and so always uses readdirattr X-Git-Tag: samba-4.4.10~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946a4dec22c41ded23d80bb541fd88e1a7a94984;p=thirdparty%2Fsamba.git 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) Autobuild-User(v4-4-test): Karolin Seeger Autobuild-Date(v4-4-test): Wed Feb 1 16:27:14 CET 2017 on sn-devel-144 --- diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 89e9412b411..ecd150e1bc7 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); }