revert ...

[metze/samba/wip.git] / libcli / security / secdesc.c

diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index 9b59634e97c46443206261f285ce4a95a9827f10..53e0e023a7b9186aef87f84df821ed3e5a1bf085 100644 (file)
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -522,11 +522,6 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
                        }
                }
 
-               if (ace->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
-                       creator = &ace->trustee;
-                       ptrustee = &ace->trustee;
-               }
-
                /* The CREATOR sids are special when inherited */
                if (dom_sid_equal(ptrustee, &global_sid_Creator_Owner)) {
                        creator = &global_sid_Creator_Owner;
@@ -628,8 +623,6 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
                }
        }
 
-       security_acl_map_generic(new_dacl, &file_generic_mapping);
-
        *ppsd = make_sec_desc(ctx,
                        SECURITY_DESCRIPTOR_REVISION_1,
                        SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT|