summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-11-25 00:59:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:26 -0500
commitf3cb4f31a20c01f34d92a4d0a6f76c8ea920af8b (patch)
treeeda7096d02328ea1d8f9b9eaf1dff6bad748a4a9 /source3
parentc5c2dd6dbaa8baf0b1ee53a5a048a3cc0fb3f165 (diff)
downloadsamba-f3cb4f31a20c01f34d92a4d0a6f76c8ea920af8b.tar.gz
samba-f3cb4f31a20c01f34d92a4d0a6f76c8ea920af8b.tar.bz2
samba-f3cb4f31a20c01f34d92a4d0a6f76c8ea920af8b.zip
r3951: Fix for bugid #2081 reported by John Janosik <jpjanosi@us.ibm.com> - ensure
SE_DESC_DACL_PROTECTED is set if "map acl inherit = no". Jeremy. (This used to be commit 934c41b474c8959310389378bfa7d3332bd5ec79)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/posix_acls.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 7e20313b76..d2e12fc82a 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2880,9 +2880,11 @@ size_t get_nt_acl(files_struct *fsp, uint32 security_info, SEC_DESC **ppdesc)
* inherited at file create time, so ACLs never contain
* any ACEs that are inherited dynamically. The DACL_PROTECTED
* flag doesn't seem to bother Windows NT.
+ * Always set this if map acl inherit is turned off.
*/
- if (get_protected_flag(pal))
+ if (get_protected_flag(pal) || !lp_map_acl_inherit(SNUM(conn))) {
psd->type |= SE_DESC_DACL_PROTECTED;
+ }
}
if (psd->dacl)