[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-711-gbb8a4a9

[Nadezhda Ivanova]

The branch, master has been updated
       via  bb8a4a9d73915bc35430904bb45318141bb21e22 (commit)
       via  df0d629f3726daf71beaa5ec07b284b865adc000 (commit)
      from  3aa147f8d20bc5124dca1f4746da678a55247b82 (commit)

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


- Log -----------------------------------------------------------------
commit bb8a4a9d73915bc35430904bb45318141bb21e22
Merge: df0d629f3726daf71beaa5ec07b284b865adc000 3aa147f8d20bc5124dca1f4746da678a55247b82
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Thu Sep 24 18:57:27 2009 -0700

    Merge branch 'master' of git://git.samba.org/samba

commit df0d629f3726daf71beaa5ec07b284b865adc000
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Thu Sep 24 18:29:57 2009 -0700

    Fixed a dereferenced null pointer.

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

Summary of changes:
 source4/libcli/security/create_descriptor.c |   30 ++++++++++++--------------
 1 files changed, 14 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/security/create_descriptor.c b/source4/libcli/security/create_descriptor.c
index 1054479..ebf07ac 100644
--- a/source4/libcli/security/create_descriptor.c
+++ b/source4/libcli/security/create_descriptor.c
@@ -102,9 +102,13 @@ static bool contains_inheritable_aces(struct security_acl *acl)
 static struct security_acl *preprocess_creator_acl(TALLOC_CTX *mem, struct security_acl *acl)
 {
 	int i;
-	struct security_acl *new_acl = talloc_zero(mem, struct security_acl);
+	struct security_acl *new_acl; 
+	if (!acl) {
+		return NULL;
+	}
+	
+	new_acl = talloc_zero(mem, struct security_acl);
 
-	new_acl->revision = acl->revision;
 	for (i=0; i < acl->num_aces; i++) {
 		struct security_ace *ace = &acl->aces[i];
 		if (!(ace->flags & SEC_ACE_FLAG_INHERITED_ACE)){
@@ -369,20 +373,14 @@ static bool compute_acl(int acl_type,
 			goto final;
 	}
 	else{
-		if (!c_acl){
-			if (acl_type == SEC_DESC_DACL_PRESENT && token->default_dacl)
-				*new_acl = security_acl_dup(new_sd, token->default_dacl);
-		}
-		else{
-			*new_acl = preprocess_creator_acl(new_sd,c_acl);
-			if (*new_acl == NULL)
-				goto final;
-			if (!postprocess_acl(*new_acl, new_sd->owner_sid,
-					     new_sd->group_sid,generic_map))
-				return false;
-			else
-				goto final;
-		}
+		*new_acl = preprocess_creator_acl(new_sd,c_acl);
+		if (*new_acl == NULL)
+			goto final;
+		if (!postprocess_acl(*new_acl, new_sd->owner_sid,
+				     new_sd->group_sid,generic_map))
+			return false;
+		else
+			goto final;
 	}
 final:
 	if (acl_type == SEC_DESC_DACL_PRESENT && new_sd->dacl)


-- 
Samba Shared Repository