From 24bf25cacfaa727b06b99421b780502aba4b065c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 2 Dec 2011 10:55:40 -0800 Subject: [PATCH] Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on a directory with no stored ACL. If referring to an fsp sbuf can be left as an uninitialized variable, causing the 'is_directory' variable to be false when it should be true. (cherry picked from commit 16c0d52842386fc2ebf975166b57b888d36796c5) (cherry picked from commit c4e0462a9edfee64cba6cf5db18a54cc3c51c4f1) --- source3/modules/vfs_acl_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index ecc889a60d6..e8c79e6eab1 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -373,7 +373,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle, return map_nt_error_from_unix(errno); } } - is_directory = S_ISDIR(sbuf.st_ex_mode); + is_directory = S_ISDIR(psbuf->st_ex_mode); if (ignore_file_system_acl) { TALLOC_FREE(pdesc_next); -- 2.34.1