From: Jeremy Allison <jra@samba.org>
Date: Fri, 2 Dec 2011 18:55:40 +0000 (-0800)
Subject: Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable... 
X-Git-Tag: samba-3.6.2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45c5b631eb6e7789e399f13b426b7d60b9d89653;p=thirdparty%2Fsamba.git

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

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 81c734a535d..f82f0319c1a 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -378,7 +378,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);