diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-06 23:29:20 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-06 23:29:20 -0800 |
| commit | 5a2feed9dc4e7d28dee619a6941aa49be76fb298 (patch) | |
| tree | fb2c4d9eacdd5d259f9c4d4e08e03417beaf0521 /source3 | |
| parent | 8962be69c700224983af4effd2cd086f7f5800b0 (diff) | |
| download | samba-5a2feed9dc4e7d28dee619a6941aa49be76fb298.tar.gz samba-5a2feed9dc4e7d28dee619a6941aa49be76fb298.tar.bz2 samba-5a2feed9dc4e7d28dee619a6941aa49be76fb298.zip | |
If we didn't inherit any ACE's the ACE pointer should be NULL.
Jeremy.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/secdesc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 94d249564f..de547d815f 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -563,15 +563,17 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, } /* Create child security descriptor to return */ - - new_dacl = make_sec_acl(ctx, + 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; + if (!new_dacl) { + return NT_STATUS_NO_MEMORY; + } } + *ppsd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1, SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT, |