The branch, v3-3-test has been updated
via 76f7291b264084d24ea85956b6c98361417cdc71 (commit)
from 33013e40f5f4fb639ad0d3a9bd8565cd18062165 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 76f7291b264084d24ea85956b6c98361417cdc71
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Nov 6 23:29:55 2008 -0800
If we didn't inherit any ACE's the ACE pointer should be NULL.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/lib/secdesc.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/secdesc.c b/source/lib/secdesc.c
index a8324b8..a49ee8d 100644
--- a/source/lib/secdesc.c
+++ b/source/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
