Changeset 228 for branches/samba-3.2.x/source/smbd/posix_acls.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/smbd/posix_acls.c (modified) (4 diffs)

branches/samba-3.2.x/source/smbd/posix_acls.c

@@ -3222 +3222 @@
 }
 
+#if 0
+/* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
 /****************************************************************************
  Take care of parent ACL inheritance.
@@ -3414 +3417 @@
         return status;
 }
+#endif
 
 /****************************************************************************
@@ -3526 +3530 @@
         create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
 
+#if 0
+        /* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
+        /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx
+         * for details and also the log trace in bug #4308. JRA.
+         */
+
         if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
                 psd->dacl != NULL &&
@@ -3537 +3548 @@
                 }
         }
+#endif
 
         acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,