Index: smbd/posix_acls.c
===================================================================
--- smbd/posix_acls.c	(revision 3945)
+++ smbd/posix_acls.c	(working copy)
@@ -2880,9 +2880,11 @@
 		 * 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)