Changeset 746 for vendor/current/source3/lib/secdesc.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/lib/secdesc.c (modified) (5 diffs)

vendor/current/source3/lib/secdesc.c

@@ -535 +535 @@
         const struct security_acl *the_acl = parent_ctr->dacl;
 
+        if (the_acl == NULL) {
+                return false;
+        }
+
         for (i = 0; i < the_acl->num_aces; i++) {
                 const struct security_ace *ace = &the_acl->aces[i];
@@ -560 +564 @@
         struct security_ace *new_ace_list = NULL;
         unsigned int new_ace_list_ndx = 0, i;
+        bool set_inherited_flags = (parent_ctr->type & SEC_DESC_DACL_AUTO_INHERITED);
 
         *ppsd = NULL;
@@ -622 +627 @@
                         /* First add the regular ACE entry. */
                         init_sec_ace(new_ace, ptrustee, ace->type,
-                                ace->access_mask, 0);
+                                ace->access_mask,
+                                set_inherited_flags ? SEC_ACE_FLAG_INHERITED_ACE : 0);
 
                         DEBUG(5,("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x"
@@ -645 +651 @@
 
                 init_sec_ace(new_ace, ptrustee, ace->type,
-                             ace->access_mask, new_flags);
+                                ace->access_mask, new_flags |
+                                (set_inherited_flags ? SEC_ACE_FLAG_INHERITED_ACE : 0));
 
                 DEBUG(5, ("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x "
@@ -672 +679 @@
         *ppsd = make_sec_desc(ctx,
                         SECURITY_DESCRIPTOR_REVISION_1,
-                        SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
+                        SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT|
+                        (set_inherited_flags ? SEC_DESC_DACL_AUTO_INHERITED : 0),
                         owner_sid,
                         group_sid,