svn commit: samba r8048 - branches/SAMBA_3_0/source/libads trunk/source/libads

[gd at samba.org]

Author: gd
Date: 2005-07-01 10:28:31 +0000 (Fri, 01 Jul 2005)
New Revision: 8048

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

Log:
Replace "done" with "failed".

Guenther



Modified:
   branches/SAMBA_3_0/source/libads/ldap.c
   trunk/source/libads/ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2005-07-01 10:20:28 UTC (rev 8047)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2005-07-01 10:28:31 UTC (rev 8048)
@@ -2397,28 +2397,28 @@
 	const char *attrs[] = { "lDAPDisplayName", NULL };
 
 	if (ads == NULL || mem_ctx == NULL || OID == NULL) {
-		goto done;
+		goto failed;
 	}
 
 	expr = talloc_asprintf(mem_ctx, "(attributeId=%s)", OID);
 	if (expr == NULL) {
-		goto done;
+		goto failed;
 	}
 
 	rc = ads_do_search_retry(ads, ads->config.schema_path, 
 			LDAP_SCOPE_SUBTREE, expr, attrs, &res);
 	if (!ADS_ERR_OK(rc)) {
-		goto done;
+		goto failed;
 	}
 
 	count = ads_count_replies(ads, res);
 	if (count == 0 || !res) {
-		goto done;
+		goto failed;
 	}
 
 	return ads_pull_string(ads, mem_ctx, res, "lDAPDisplayName");
 	
-done:
+failed:
 	DEBUG(0,("ads_get_attrname_by_oid: failed to retrieve name for oid: %s\n", 
 		OID));
 	

Modified: trunk/source/libads/ldap.c
===================================================================
--- trunk/source/libads/ldap.c	2005-07-01 10:20:28 UTC (rev 8047)
+++ trunk/source/libads/ldap.c	2005-07-01 10:28:31 UTC (rev 8048)
@@ -2385,28 +2385,28 @@
 	const char *attrs[] = { "lDAPDisplayName", NULL };
 
 	if (ads == NULL || mem_ctx == NULL || OID == NULL) {
-		goto done;
+		goto failed;
 	}
 
 	expr = talloc_asprintf(mem_ctx, "(attributeId=%s)", OID);
 	if (expr == NULL) {
-		goto done;
+		goto failed;
 	}
 
 	rc = ads_do_search_retry(ads, ads->config.schema_path, 
 			LDAP_SCOPE_SUBTREE, expr, attrs, &res);
 	if (!ADS_ERR_OK(rc)) {
-		goto done;
+		goto failed;
 	}
 
 	count = ads_count_replies(ads, res);
 	if (count == 0 || !res) {
-		goto done;
+		goto failed;
 	}
 
 	return ads_pull_string(ads, mem_ctx, res, "lDAPDisplayName");
 	
-done:
+failed:
 	DEBUG(0,("ads_get_attrname_by_oid: failed to retrieve name for oid: %s\n", 
 		OID));