[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1746-g53de3b1

Jeremy Allison jra at samba.org
Fri May 22 01:48:07 GMT 2009


The branch, master has been updated
       via  53de3b136edbb0b8e7c3a0293dce657cf732f1d2 (commit)
      from  5dd82fb675dd7ec48604748e25b0b8090b360506 (commit)

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


- Log -----------------------------------------------------------------
commit 53de3b136edbb0b8e7c3a0293dce657cf732f1d2
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 21 18:48:17 2009 -0700

    Don't steal when we know the ptr will be null. Thanks to Simo for
    pointing this out.
    Jeremy.

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

Summary of changes:
 source3/groupdb/mapping_ldb.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 27a6c3e..3fbc182 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -510,12 +510,11 @@ static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
 
 	ret = ldb_search(ldb, ldb, &res, dn, LDB_SCOPE_BASE, attrs, NULL);
 	if (ret == LDB_SUCCESS && res->count == 0) {
-		talloc_steal(dn, res);
+		talloc_free(res);
 		talloc_free(dn);
 		return NT_STATUS_OK;
 	}
 	if (ret != LDB_SUCCESS) {
-		talloc_steal(dn, res);
 		talloc_free(dn);
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list