From f3cb4f31a20c01f34d92a4d0a6f76c8ea920af8b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 25 Nov 2004 00:59:44 +0000 Subject: r3951: Fix for bugid #2081 reported by John Janosik - ensure SE_DESC_DACL_PROTECTED is set if "map acl inherit = no". Jeremy. (This used to be commit 934c41b474c8959310389378bfa7d3332bd5ec79) --- source3/smbd/posix_acls.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- cgit