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

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/smbd/posix_acls.c (modified) (1 diff)

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

@@ -3401 +3401 @@
         }
 
-        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;
 }