summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-12-02 10:55:40 -0800
committerJeremy Allison <jra@samba.org>2011-12-02 22:13:03 +0100
commit46551d750dc58b32630fb6744364fe5a1052b87d (patch)
tree23a6bee5a42f9d7bf361f41d4fb6a0d48652a530 /source3/modules
parent3e0d923096cddcbf83cfa2d9594df5fa21331650 (diff)
downloadsamba-46551d750dc58b32630fb6744364fe5a1052b87d.tar.gz
samba-46551d750dc58b32630fb6744364fe5a1052b87d.tar.bz2
samba-46551d750dc58b32630fb6744364fe5a1052b87d.zip
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. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Dec 2 22:13:03 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_acl_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 00ac2a1932..bf535c557b 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -391,7 +391,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);