[SCM] Samba Shared Repository - branch master updated - 5a2feed9dc4e7d28dee619a6941aa49be76fb298

[Jeremy Allison]

The branch, master has been updated
       via  5a2feed9dc4e7d28dee619a6941aa49be76fb298 (commit)
      from  8962be69c700224983af4effd2cd086f7f5800b0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5a2feed9dc4e7d28dee619a6941aa49be76fb298
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Thu Nov 6 23:29:20 2008 -0800

    If we didn't inherit any ACE's the ACE pointer should be NULL.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/secdesc.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 94d2495..de547d8 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,


-- 
Samba Shared Repository