Merge branch 'master' of git://git.samba.org/samba into teventfix
[samba.git] / source3 / lib / secdesc.c
index a443f90dbb4aaeebaa823f9d43e8ba9b1349f40d..a81c4ae82a2e3ba8150527af896ffa8e382d4ac9 100644 (file)
@@ -8,7 +8,7 @@
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
 
 /* Map generic permissions to file object specific permissions */
 
-struct generic_mapping file_generic_mapping = {
+const struct generic_mapping file_generic_mapping = {
        FILE_GENERIC_READ,
        FILE_GENERIC_WRITE,
        FILE_GENERIC_EXECUTE,
        FILE_GENERIC_ALL
 };
 
-/*******************************************************************
- Works out the linearization size of a SEC_DESC.
-********************************************************************/
-
-size_t sec_desc_size(SEC_DESC *psd)
-{
-       size_t offset;
-
-       if (!psd) return 0;
-
-       offset = SEC_DESC_HEADER_SIZE;
-
-       /* don't align */
-
-       if (psd->owner_sid != NULL)
-               offset += sid_size(psd->owner_sid);
-
-       if (psd->grp_sid != NULL)
-               offset += sid_size(psd->grp_sid);
-
-       if (psd->sacl != NULL)
-               offset += psd->sacl->size;
-
-       if (psd->dacl != NULL)
-               offset += psd->dacl->size;
-
-       return offset;
-}
-
 /*******************************************************************
  Compares two SEC_DESC structures
 ********************************************************************/
 
-BOOL sec_desc_equal(SEC_DESC *s1, SEC_DESC *s2)
+bool sec_desc_equal(SEC_DESC *s1, SEC_DESC *s2)
 {
        /* Trivial case */
 
@@ -94,24 +64,16 @@ BOOL sec_desc_equal(SEC_DESC *s1, SEC_DESC *s2)
        /* Check owner and group */
 
        if (!sid_equal(s1->owner_sid, s2->owner_sid)) {
-               fstring str1, str2;
-
-               sid_to_string(str1, s1->owner_sid);
-               sid_to_string(str2, s2->owner_sid);
-
                DEBUG(10, ("sec_desc_equal(): owner differs (%s != %s)\n",
-                          str1, str2));
+                          sid_string_dbg(s1->owner_sid),
+                          sid_string_dbg(s2->owner_sid)));
                return False;
        }
 
-       if (!sid_equal(s1->grp_sid, s2->grp_sid)) {
-               fstring str1, str2;
-
-               sid_to_string(str1, s1->grp_sid);
-               sid_to_string(str2, s2->grp_sid);
-
+       if (!sid_equal(s1->group_sid, s2->group_sid)) {
                DEBUG(10, ("sec_desc_equal(): group differs (%s != %s)\n",
-                          str1, str2));
+                          sid_string_dbg(s1->group_sid),
+                          sid_string_dbg(s2->group_sid)));
                return False;
        }
 
@@ -137,6 +99,33 @@ BOOL sec_desc_equal(SEC_DESC *s1, SEC_DESC *s2)
        return True;
 }
 
+/*******************************************************************
+ Given a security_descriptor return the sec_info.
+********************************************************************/
+
+uint32_t get_sec_info(const SEC_DESC *sd)
+{
+       uint32_t sec_info = ALL_SECURITY_INFORMATION;
+
+       SMB_ASSERT(sd);
+
+       if (sd->owner_sid == NULL) {
+               sec_info &= ~OWNER_SECURITY_INFORMATION;
+       }
+       if (sd->group_sid == NULL) {
+               sec_info &= ~GROUP_SECURITY_INFORMATION;
+       }
+       if (sd->sacl == NULL) {
+               sec_info &= ~SACL_SECURITY_INFORMATION;
+       }
+       if (sd->dacl == NULL) {
+               sec_info &= ~DACL_SECURITY_INFORMATION;
+       }
+
+       return sec_info;
+}
+
+
 /*******************************************************************
  Merge part of security descriptor old_sec in to the empty sections of 
  security descriptor new_sec.
@@ -154,13 +143,13 @@ SEC_DESC_BUF *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BU
        /* Copy over owner and group sids.  There seems to be no flag for
           this so just check the pointer values. */
 
-       owner_sid = new_sdb->sec->owner_sid ? new_sdb->sec->owner_sid :
-               old_sdb->sec->owner_sid;
+       owner_sid = new_sdb->sd->owner_sid ? new_sdb->sd->owner_sid :
+               old_sdb->sd->owner_sid;
 
-       group_sid = new_sdb->sec->grp_sid ? new_sdb->sec->grp_sid :
-               old_sdb->sec->grp_sid;
+       group_sid = new_sdb->sd->group_sid ? new_sdb->sd->group_sid :
+               old_sdb->sd->group_sid;
        
-       secdesc_type = new_sdb->sec->type;
+       secdesc_type = new_sdb->sd->type;
 
        /* Ignore changes to the system ACL.  This has the effect of making
           changes through the security tab audit button not sticking. 
@@ -172,14 +161,14 @@ SEC_DESC_BUF *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BU
        /* Copy across discretionary ACL */
 
        if (secdesc_type & SEC_DESC_DACL_PRESENT) {
-               dacl = new_sdb->sec->dacl;
+               dacl = new_sdb->sd->dacl;
        } else {
-               dacl = old_sdb->sec->dacl;
+               dacl = old_sdb->sd->dacl;
        }
 
        /* Create new security descriptor from bits */
 
-       psd = make_sec_desc(ctx, new_sdb->sec->revision, secdesc_type,
+       psd = make_sec_desc(ctx, new_sdb->sd->revision, secdesc_type,
                            owner_sid, group_sid, sacl, dacl, &secdesc_size);
 
        return_sdb = make_sec_desc_buf(ctx, secdesc_size, psd);
@@ -191,7 +180,9 @@ SEC_DESC_BUF *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BU
  Creates a SEC_DESC structure
 ********************************************************************/
 
-SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision, uint16 type,
+SEC_DESC *make_sec_desc(TALLOC_CTX *ctx,
+                       enum security_descriptor_revision revision,
+                       uint16 type,
                        const DOM_SID *owner_sid, const DOM_SID *grp_sid,
                        SEC_ACL *sacl, SEC_ACL *dacl, size_t *sd_size)
 {
@@ -211,21 +202,21 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision, uint16 type,
        if (dacl)
                dst->type |= SEC_DESC_DACL_PRESENT;
 
-       dst->off_owner_sid = 0;
-       dst->off_grp_sid   = 0;
-       dst->off_sacl      = 0;
-       dst->off_dacl      = 0;
+       dst->owner_sid = NULL;
+       dst->group_sid   = NULL;
+       dst->sacl      = NULL;
+       dst->dacl      = NULL;
 
-       if(owner_sid && ((dst->owner_sid = sid_dup_talloc(ctx,owner_sid)) == NULL))
+       if(owner_sid && ((dst->owner_sid = sid_dup_talloc(dst,owner_sid)) == NULL))
                goto error_exit;
 
-       if(grp_sid && ((dst->grp_sid = sid_dup_talloc(ctx,grp_sid)) == NULL))
+       if(grp_sid && ((dst->group_sid = sid_dup_talloc(dst,grp_sid)) == NULL))
                goto error_exit;
 
-       if(sacl && ((dst->sacl = dup_sec_acl(ctx, sacl)) == NULL))
+       if(sacl && ((dst->sacl = dup_sec_acl(dst, sacl)) == NULL))
                goto error_exit;
 
-       if(dacl && ((dst->dacl = dup_sec_acl(ctx, dacl)) == NULL))
+       if(dacl && ((dst->dacl = dup_sec_acl(dst, dacl)) == NULL))
                goto error_exit;
 
        offset = SEC_DESC_HEADER_SIZE;
@@ -235,22 +226,18 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, uint16 revision, uint16 type,
         */
 
        if (dst->sacl != NULL) {
-               dst->off_sacl = offset;
                offset += dst->sacl->size;
        }
        if (dst->dacl != NULL) {
-               dst->off_dacl = offset;
                offset += dst->dacl->size;
        }
 
        if (dst->owner_sid != NULL) {
-               dst->off_owner_sid = offset;
-               offset += sid_size(dst->owner_sid);
+               offset += ndr_size_dom_sid(dst->owner_sid, NULL, 0);
        }
 
-       if (dst->grp_sid != NULL) {
-               dst->off_grp_sid = offset;
-               offset += sid_size(dst->grp_sid);
+       if (dst->group_sid != NULL) {
+               offset += ndr_size_dom_sid(dst->group_sid, NULL, 0);
        }
 
        *sd_size = (size_t)offset;
@@ -274,10 +261,134 @@ SEC_DESC *dup_sec_desc(TALLOC_CTX *ctx, const SEC_DESC *src)
                return NULL;
 
        return make_sec_desc( ctx, src->revision, src->type,
-                               src->owner_sid, src->grp_sid, src->sacl,
+                               src->owner_sid, src->group_sid, src->sacl,
                                src->dacl, &dummy);
 }
 
+/*******************************************************************
+ Convert a secdesc into a byte stream
+********************************************************************/
+NTSTATUS marshall_sec_desc(TALLOC_CTX *mem_ctx,
+                          struct security_descriptor *secdesc,
+                          uint8 **data, size_t *len)
+{
+       DATA_BLOB blob;
+       enum ndr_err_code ndr_err;
+
+       ndr_err = ndr_push_struct_blob(
+               &blob, mem_ctx, NULL, secdesc,
+               (ndr_push_flags_fn_t)ndr_push_security_descriptor);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("ndr_push_security_descriptor failed: %s\n",
+                         ndr_errstr(ndr_err)));
+               return ndr_map_error2ntstatus(ndr_err);;
+       }
+
+       *data = blob.data;
+       *len = blob.length;
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ Convert a secdesc_buf into a byte stream
+********************************************************************/
+
+NTSTATUS marshall_sec_desc_buf(TALLOC_CTX *mem_ctx,
+                              struct sec_desc_buf *secdesc_buf,
+                              uint8_t **data, size_t *len)
+{
+       DATA_BLOB blob;
+       enum ndr_err_code ndr_err;
+
+       ndr_err = ndr_push_struct_blob(
+               &blob, mem_ctx, NULL, secdesc_buf,
+               (ndr_push_flags_fn_t)ndr_push_sec_desc_buf);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("ndr_push_sec_desc_buf failed: %s\n",
+                         ndr_errstr(ndr_err)));
+               return ndr_map_error2ntstatus(ndr_err);;
+       }
+
+       *data = blob.data;
+       *len = blob.length;
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ Parse a byte stream into a secdesc
+********************************************************************/
+NTSTATUS unmarshall_sec_desc(TALLOC_CTX *mem_ctx, uint8 *data, size_t len,
+                            struct security_descriptor **psecdesc)
+{
+       DATA_BLOB blob;
+       enum ndr_err_code ndr_err;
+       struct security_descriptor *result;
+
+       if ((data == NULL) || (len == 0)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       result = TALLOC_ZERO_P(mem_ctx, struct security_descriptor);
+       if (result == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       blob = data_blob_const(data, len);
+
+       ndr_err = ndr_pull_struct_blob(
+               &blob, result, NULL, result,
+               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("ndr_pull_security_descriptor failed: %s\n",
+                         ndr_errstr(ndr_err)));
+               TALLOC_FREE(result);
+               return ndr_map_error2ntstatus(ndr_err);;
+       }
+
+       *psecdesc = result;
+       return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ Parse a byte stream into a sec_desc_buf
+********************************************************************/
+
+NTSTATUS unmarshall_sec_desc_buf(TALLOC_CTX *mem_ctx, uint8_t *data, size_t len,
+                                struct sec_desc_buf **psecdesc_buf)
+{
+       DATA_BLOB blob;
+       enum ndr_err_code ndr_err;
+       struct sec_desc_buf *result;
+
+       if ((data == NULL) || (len == 0)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       result = TALLOC_ZERO_P(mem_ctx, struct sec_desc_buf);
+       if (result == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       blob = data_blob_const(data, len);
+
+       ndr_err = ndr_pull_struct_blob(
+               &blob, result, NULL, result,
+               (ndr_pull_flags_fn_t)ndr_pull_sec_desc_buf);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(0, ("ndr_pull_sec_desc_buf failed: %s\n",
+                         ndr_errstr(ndr_err)));
+               TALLOC_FREE(result);
+               return ndr_map_error2ntstatus(ndr_err);;
+       }
+
+       *psecdesc_buf = result;
+       return NT_STATUS_OK;
+}
+
 /*******************************************************************
  Creates a SEC_DESC structure with typical defaults.
 ********************************************************************/
@@ -285,8 +396,9 @@ SEC_DESC *dup_sec_desc(TALLOC_CTX *ctx, const SEC_DESC *src)
 SEC_DESC *make_standard_sec_desc(TALLOC_CTX *ctx, const DOM_SID *owner_sid, const DOM_SID *grp_sid,
                                 SEC_ACL *dacl, size_t *sd_size)
 {
-       return make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
-                            owner_sid, grp_sid, NULL, dacl, sd_size);
+       return make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
+                            SEC_DESC_SELF_RELATIVE, owner_sid, grp_sid, NULL,
+                            dacl, sd_size);
 }
 
 /*******************************************************************
@@ -301,15 +413,12 @@ SEC_DESC_BUF *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, SEC_DESC *sec_desc)
                return NULL;
 
        /* max buffer size (allocated size) */
-       dst->max_len = (uint32)len;
-       dst->len = (uint32)len;
+       dst->sd_size = (uint32)len;
        
-       if(sec_desc && ((dst->sec = dup_sec_desc(ctx, sec_desc)) == NULL)) {
+       if(sec_desc && ((dst->sd = dup_sec_desc(ctx, sec_desc)) == NULL)) {
                return NULL;
        }
 
-       dst->ptr = 0x1;
-
        return dst;
 }
 
@@ -322,7 +431,7 @@ SEC_DESC_BUF *dup_sec_desc_buf(TALLOC_CTX *ctx, SEC_DESC_BUF *src)
        if(src == NULL)
                return NULL;
 
-       return make_sec_desc_buf( ctx, src->len, src->sec);
+       return make_sec_desc_buf( ctx, src->sd_size, src->sd);
 }
 
 /*******************************************************************
@@ -336,12 +445,12 @@ NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, uint32
        SEC_ACE  *ace  = 0;
        NTSTATUS  status;
 
-       *sd_size = 0;
-
        if (!ctx || !psd || !sid || !sd_size)
                return NT_STATUS_INVALID_PARAMETER;
 
-       status = sec_ace_add_sid(ctx, &ace, psd[0]->dacl->ace, &psd[0]->dacl->num_aces, sid, mask);
+       *sd_size = 0;
+
+       status = sec_ace_add_sid(ctx, &ace, psd[0]->dacl->aces, &psd[0]->dacl->num_aces, sid, mask);
        
        if (!NT_STATUS_IS_OK(status))
                return status;
@@ -350,7 +459,7 @@ NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, uint32
                return NT_STATUS_UNSUCCESSFUL;
        
        if (!(sd = make_sec_desc(ctx, psd[0]->revision, psd[0]->type, psd[0]->owner_sid, 
-               psd[0]->grp_sid, psd[0]->sacl, dacl, sd_size)))
+               psd[0]->group_sid, psd[0]->sacl, dacl, sd_size)))
                return NT_STATUS_UNSUCCESSFUL;
 
        *psd = sd;
@@ -369,7 +478,7 @@ NTSTATUS sec_desc_mod_sid(SEC_DESC *sd, DOM_SID *sid, uint32 mask)
        if (!sd || !sid)
                return NT_STATUS_INVALID_PARAMETER;
 
-       status = sec_ace_mod_sid(sd->dacl->ace, sd->dacl->num_aces, sid, mask);
+       status = sec_ace_mod_sid(sd->dacl->aces, sd->dacl->num_aces, sid, mask);
 
        if (!NT_STATUS_IS_OK(status))
                return status;
@@ -388,12 +497,12 @@ NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t
        SEC_ACE  *ace  = 0;
        NTSTATUS  status;
 
-       *sd_size = 0;
-       
        if (!ctx || !psd[0] || !sid || !sd_size)
                return NT_STATUS_INVALID_PARAMETER;
 
-       status = sec_ace_del_sid(ctx, &ace, psd[0]->dacl->ace, &psd[0]->dacl->num_aces, sid);
+       *sd_size = 0;
+       
+       status = sec_ace_del_sid(ctx, &ace, psd[0]->dacl->aces, &psd[0]->dacl->num_aces, sid);
 
        if (!NT_STATUS_IS_OK(status))
                return status;
@@ -402,7 +511,7 @@ NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t
                return NT_STATUS_UNSUCCESSFUL;
        
        if (!(sd = make_sec_desc(ctx, psd[0]->revision, psd[0]->type, psd[0]->owner_sid, 
-               psd[0]->grp_sid, psd[0]->sacl, dacl, sd_size)))
+               psd[0]->group_sid, psd[0]->sacl, dacl, sd_size)))
                return NT_STATUS_UNSUCCESSFUL;
 
        *psd = sd;
@@ -410,19 +519,47 @@ NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t
        return NT_STATUS_OK;
 }
 
+/*
+ * Determine if an ACE is inheritable
+ */
+
+static bool is_inheritable_ace(const SEC_ACE *ace,
+                               bool container)
+{
+       if (!container) {
+               return ((ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) != 0);
+       }
+
+       if (ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) {
+               return true;
+       }
+
+       if ((ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) &&
+                       !(ace->flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT)) {
+               return true;
+       }
+
+       return false;
+}
+
 /* Create a child security descriptor using another security descriptor as
    the parent container.  This child object can either be a container or
    non-container object. */
 
-SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr, 
-                                     BOOL child_container)
+NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
+                                       SEC_DESC **ppsd,
+                                       size_t *psize,
+                                       const SEC_DESC *parent_ctr,
+                                       const DOM_SID *owner_sid,
+                                       const DOM_SID *group_sid,
+                                       bool container)
 {
-       SEC_DESC_BUF *sdb;
-       SEC_DESC *sd;
-       SEC_ACL *new_dacl, *the_acl;
+       SEC_ACL *new_dacl = NULL, *the_acl = NULL;
        SEC_ACE *new_ace_list = NULL;
        unsigned int new_ace_list_ndx = 0, i;
-       size_t size;
+
+       *ppsd = NULL;
+       *psize = 0;
 
        /* Currently we only process the dacl when creating the child.  The
           sacl should also be processed but this is left out as sacls are
@@ -430,107 +567,144 @@ SEC_DESC_BUF *se_create_child_secdesc(TALLOC_CTX *ctx, SEC_DESC *parent_ctr,
 
        the_acl = parent_ctr->dacl;
 
-       if (!(new_ace_list = TALLOC_ARRAY(ctx, SEC_ACE, the_acl->num_aces))) 
-               return NULL;
+       if (the_acl->num_aces) {
+               if (2*the_acl->num_aces < the_acl->num_aces) {
+                       return NT_STATUS_NO_MEMORY;
+               }
 
-       for (i = 0; the_acl && i < the_acl->num_aces; i++) {
-               SEC_ACE *ace = &the_acl->ace[i];
+               if (!(new_ace_list = TALLOC_ARRAY(ctx, SEC_ACE,
+                                               2*the_acl->num_aces))) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+       } else {
+               new_ace_list = NULL;
+       }
+
+       for (i = 0; i < the_acl->num_aces; i++) {
+               const SEC_ACE *ace = &the_acl->aces[i];
                SEC_ACE *new_ace = &new_ace_list[new_ace_list_ndx];
-               uint8 new_flags = 0;
-               BOOL inherit = False;
-               fstring sid_str;
+               const DOM_SID *ptrustee = &ace->trustee;
+               const DOM_SID *creator = NULL;
+               uint8 new_flags = ace->flags;
 
-               /* The OBJECT_INHERIT_ACE flag causes the ACE to be
-                  inherited by non-container children objects.  Container
-                  children objects will inherit it as an INHERIT_ONLY
-                  ACE. */
+               if (!is_inheritable_ace(ace, container)) {
+                       continue;
+               }
 
-               if (ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) {
+               /* see the RAW-ACLS inheritance test for details on these rules */
+               if (!container) {
+                       new_flags = 0;
+               } else {
+                       new_flags &= ~SEC_ACE_FLAG_INHERIT_ONLY;
 
-                       if (!child_container) {
-                               new_flags |= SEC_ACE_FLAG_OBJECT_INHERIT;
-                       } else {
+                       if (!(new_flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) {
                                new_flags |= SEC_ACE_FLAG_INHERIT_ONLY;
                        }
-
-                       inherit = True;
-               }
-
-               /* The CONAINER_INHERIT_ACE flag means all child container
-                  objects will inherit and use the ACE. */
-
-               if (ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) {
-                       if (!child_container) {
-                               inherit = False;
-                       } else {
-                               new_flags |= SEC_ACE_FLAG_CONTAINER_INHERIT;
+                       if (new_flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
+                               new_flags = 0;
                        }
                }
 
-               /* The INHERIT_ONLY_ACE is not used by the se_access_check()
-                  function for the parent container, but is inherited by
-                  all child objects as a normal ACE. */
-
-               if (ace->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
-                       /* Move along, nothing to see here */
+               /* The CREATOR sids are special when inherited */
+               if (sid_equal(ptrustee, &global_sid_Creator_Owner)) {
+                       creator = &global_sid_Creator_Owner;
+                       ptrustee = owner_sid;
+               } else if (sid_equal(ptrustee, &global_sid_Creator_Group)) {
+                       creator = &global_sid_Creator_Group;
+                       ptrustee = group_sid;
                }
 
-               /* The SEC_ACE_FLAG_NO_PROPAGATE_INHERIT flag means the ACE
-                  is inherited by child objects but not grandchildren
-                  objects.  We clear the object inherit and container
-                  inherit flags in the inherited ACE. */
+               if (creator && container &&
+                               (new_flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) {
 
-               if (ace->flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
-                       new_flags &= ~(SEC_ACE_FLAG_OBJECT_INHERIT |
-                                      SEC_ACE_FLAG_CONTAINER_INHERIT);
-               }
+                       /* First add the regular ACE entry. */
+                       init_sec_ace(new_ace, ptrustee, ace->type,
+                               ace->access_mask, 0);
 
-               /* Add ACE to ACE list */
+                       DEBUG(5,("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x"
+                               " inherited as %s:%d/0x%02x/0x%08x\n",
+                               sid_string_dbg(&ace->trustee),
+                               ace->type, ace->flags, ace->access_mask,
+                               sid_string_dbg(&new_ace->trustee),
+                               new_ace->type, new_ace->flags,
+                               new_ace->access_mask));
 
-               if (!inherit)
-                       continue;
+                       new_ace_list_ndx++;
+
+                       /* Now add the extra creator ACE. */
+                       new_ace = &new_ace_list[new_ace_list_ndx];
 
-               init_sec_access(&new_ace->info, ace->info.mask);
-               init_sec_ace(new_ace, &ace->trustee, ace->type,
-                            new_ace->info, new_flags);
+                       ptrustee = creator;
+                       new_flags |= SEC_ACE_FLAG_INHERIT_ONLY;
+               } else if (container &&
+                               !(ace->flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT)) {
+                       ptrustee = &ace->trustee;
+               }
 
-               sid_to_string(sid_str, &ace->trustee);
+               init_sec_ace(new_ace, ptrustee, ace->type,
+                            ace->access_mask, new_flags);
 
                DEBUG(5, ("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x "
-                         " inherited as %s:%d/0x%02x/0x%08x\n", sid_str,
-                         ace->type, ace->flags, ace->info.mask,
-                         sid_str, new_ace->type, new_ace->flags,
-                         new_ace->info.mask));
+                         " inherited as %s:%d/0x%02x/0x%08x\n",
+                         sid_string_dbg(&ace->trustee),
+                         ace->type, ace->flags, ace->access_mask,
+                         sid_string_dbg(&ace->trustee),
+                         new_ace->type, new_ace->flags,
+                         new_ace->access_mask));
 
                new_ace_list_ndx++;
        }
 
        /* Create child security descriptor to return */
-       
-       new_dacl = make_sec_acl(ctx, ACL_REVISION, new_ace_list_ndx, new_ace_list);
-
-       /* Use the existing user and group sids.  I don't think this is
-          correct.  Perhaps the user and group should be passed in as
-          parameters by the caller? */
-
-       sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
-                          parent_ctr->owner_sid,
-                          parent_ctr->grp_sid,
-                          parent_ctr->sacl,
-                          new_dacl, &size);
-
-       sdb = make_sec_desc_buf(ctx, size, sd);
+       if (new_ace_list_ndx) {
+               new_dacl = make_sec_acl(ctx,
+                               NT4_ACL_REVISION,
+                               new_ace_list_ndx,
+                               new_ace_list);
+
+               if (!new_dacl) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
 
-       return sdb;
+       *ppsd = make_sec_desc(ctx,
+                       SECURITY_DESCRIPTOR_REVISION_1,
+                       SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
+                       owner_sid,
+                       group_sid,
+                       NULL,
+                       new_dacl,
+                       psize);
+       if (!*ppsd) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
 }
 
-/*******************************************************************
- Sets up a SEC_ACCESS structure.
-********************************************************************/
-
-void init_sec_access(SEC_ACCESS *t, uint32 mask)
+NTSTATUS se_create_child_secdesc_buf(TALLOC_CTX *ctx,
+                                       SEC_DESC_BUF **ppsdb,
+                                       const SEC_DESC *parent_ctr,
+                                       bool container)
 {
-       t->mask = mask;
-}
-
+       NTSTATUS status;
+       size_t size = 0;
+       SEC_DESC *sd = NULL;
+
+       *ppsdb = NULL;
+       status = se_create_child_secdesc(ctx,
+                                       &sd,
+                                       &size,
+                                       parent_ctr,
+                                       parent_ctr->owner_sid,
+                                       parent_ctr->group_sid,
+                                       container);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
+       *ppsdb = make_sec_desc_buf(ctx, size, sd);
+       if (!*ppsdb) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
+}