svn commit: samba r3951 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2004-11-25 00:59:44 +0000 (Thu, 25 Nov 2004)
New Revision: 3951

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3951

Log:
Fix for bugid #2081 reported by John Janosik <jpjanosi at us.ibm.com> - ensure
SE_DESC_DACL_PROTECTED is set if "map acl inherit = no".
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/posix_acls.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/posix_acls.c	2004-11-25 00:59:37 UTC (rev 3950)
+++ branches/SAMBA_3_0/source/smbd/posix_acls.c	2004-11-25 00:59:44 UTC (rev 3951)
@@ -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)