[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f52690d libcli: Fix a memleak
      from  b22b35e messaging3: Remove a pointless return;

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


- Log -----------------------------------------------------------------
commit f52690dc68e2b2778f7c85eae64b3dc45f06409a
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 26 20:48:05 2014 +0000

    libcli: Fix a memleak
    
    struct security_ace has a struct dom_sid, not a pointer to it. So we don't have
    to talloc it first and then not free it.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue May 27 12:54:55 CEST 2014 on sn-devel-104

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

Summary of changes:
 libcli/security/security_descriptor.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c
index 574dd4e..25b316c 100644
--- a/libcli/security/security_descriptor.c
+++ b/libcli/security/security_descriptor.c
@@ -564,21 +564,19 @@ struct security_ace *security_ace_create(TALLOC_CTX *mem_ctx,
 					 uint8_t flags)
 
 {
-	struct dom_sid *sid;
 	struct security_ace *ace;
+	bool ok;
 
 	ace = talloc_zero(mem_ctx, struct security_ace);
 	if (ace == NULL) {
 		return NULL;
 	}
 
-	sid = dom_sid_parse_talloc(ace, sid_str);
-	if (sid == NULL) {
+	ok = dom_sid_parse(sid_str, &ace->trustee);
+	if (!ok) {
 		talloc_free(ace);
 		return NULL;
 	}
-
-	ace->trustee = *sid;
 	ace->type = type;
 	ace->access_mask = access_mask;
 	ace->flags = flags;


-- 
Samba Shared Repository