Changeset 165 for branches/samba-3.0/source/smbd/posix_acls.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/smbd/posix_acls.c (modified) (6 diffs)

branches/samba-3.0/source/smbd/posix_acls.c

@@ -3120 +3120 @@
 }
 
+#if 0
+/* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
 /****************************************************************************
  Take care of parent ACL inheritance.
@@ -3301 +3304 @@
         }
 
-        parent_sd->dacl->aces = new_ace;
-        parent_sd->dacl->num_aces = i;
-
-        *pp_new_sd = parent_sd;
+        /* This sucks. psd should be const and we should
+         * be doing a deep-copy here. We're getting away
+         * with is as we know parent_sd is talloced off
+         * talloc_tos() as well as psd. JRA. */
+
+        psd->dacl->aces = new_ace;
+        psd->dacl->num_aces = i;
+        psd->type &= ~(SE_DESC_DACL_AUTO_INHERITED|
+                         SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+        *pp_new_sd = psd;
         return status;
 }
+#endif
 
 /****************************************************************************
@@ -3420 +3431 @@
         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 &&
@@ -3431 +3449 @@
                 }
         }
+#endif
 
         acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
@@ -4271 +4290 @@
                 return False;
         }
+#ifndef __OS2__
+        /* Samba always runs as root on OS/2 */
         if (current_user.ut.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
                 return True;
         }
+#endif
 
         /* Check primary owner write access. */
@@ -4327 +4349 @@
                 (unsigned int)access_mask, fname ));
 
-#ifndef __OS2__
-        /* Samba always runs as root on OS/2 */
         if (current_user.ut.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
                 return True;
         }
-#endif
+
         if (!VALID_STAT(*psbuf)) {
                 /* Get the file permission mask and owners. */