svn commit: samba r26138 - in branches/SAMBA_4_0/source/dsdb/samdb: .

abartlet at samba.org abartlet at samba.org
Tue Nov 27 02:47:58 GMT 2007


Author: abartlet
Date: 2007-11-27 02:47:57 +0000 (Tue, 27 Nov 2007)
New Revision: 26138

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26138

Log:
Don't talloc_free() res if an error occoured.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c	2007-11-27 02:26:47 UTC (rev 26137)
+++ branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c	2007-11-27 02:47:57 UTC (rev 26138)
@@ -110,7 +110,10 @@
 	if (ret != LDB_SUCCESS && ret != LDB_ERR_NO_SUCH_OBJECT) {
 		DEBUG(1, ("ldb_search: dn: %s not found: %s", service_dn_str, ldb_errstring(ldb_ctx)));
 		return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
-	} else if (ret == LDB_ERR_NO_SUCH_OBJECT || res->count != 1) {
+	} else if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+		DEBUG(1, ("ldb_search: dn: %s not found", service_dn_str));
+		return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;
+	} else if (res->count != 1) {
 		talloc_free(res);
 		DEBUG(1, ("ldb_search: dn: %s not found", service_dn_str));
 		return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;



More information about the samba-cvs mailing list