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.

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 7e20313b76cefdc4a6a70065fa85a830c436af1e..d2e12fc82a9ffa72a6d4c7e79cea1c62dddf227a 100644 (file)
--- a/source/smbd/posix_acls.c
+++ b/source/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)