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

abartlet at samba.org abartlet at samba.org
Wed Feb 1 10:04:55 GMT 2006


Author: abartlet
Date: 2006-02-01 10:04:55 +0000 (Wed, 01 Feb 2006)
New Revision: 13282

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

Log:
Indentation, and ensure we handle the talloc_free in the right place
all the time.

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	2006-02-01 10:04:11 UTC (rev 13281)
+++ branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c	2006-02-01 10:04:55 UTC (rev 13282)
@@ -66,9 +66,9 @@
 		return DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
 	}
 
-	service_dn = ldb_dn_string_compose(tmp_ctx, samdb_base_dn(mem_ctx),
-						"CN=Directory Service,CN=Windows NT"
-						",CN=Services,CN=Configuration");
+	service_dn = ldb_dn_string_compose(tmp_ctx, samdb_base_dn(tmp_ctx),
+					   "CN=Directory Service,CN=Windows NT"
+					   ",CN=Services,CN=Configuration");
 	service_dn_str = ldb_dn_linearize(tmp_ctx, service_dn);
 
 	ret = ldb_search(ldb_ctx, service_dn, LDB_SCOPE_BASE, "(objectClass=nTDSService)",
@@ -77,7 +77,7 @@
 	if (ret != LDB_SUCCESS) {
 		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 (res->count > 1) {
+	} else if (res->count != 1) {
 		talloc_free(res);
 		DEBUG(1, ("ldb_search: dn: %s found %d times!", service_dn_str, res->count));
 		return DRSUAPI_DS_NAME_STATUS_NOT_FOUND;



More information about the samba-cvs mailing list