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

[vlendec at samba.org]

Author: vlendec
Date: 2005-07-01 10:20:28 +0000 (Fri, 01 Jul 2005)
New Revision: 8047

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

Log:
"oid" is defined in a heimdal header. With my gcc this generates a ton of
shadowed variable warnings. Fix that.

Volker

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 09:05:10 UTC (rev 8046)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2005-07-01 10:20:28 UTC (rev 8047)
@@ -2388,7 +2388,7 @@
 }
 
 
-const char *ads_get_attrname_by_oid(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char * oid)
+const char *ads_get_attrname_by_oid(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char * OID)
 {
 	ADS_STATUS rc;
 	int count = 0;
@@ -2396,11 +2396,11 @@
 	char *expr = NULL;
 	const char *attrs[] = { "lDAPDisplayName", NULL };
 
-	if (ads == NULL || mem_ctx == NULL || oid == NULL) {
+	if (ads == NULL || mem_ctx == NULL || OID == NULL) {
 		goto done;
 	}
 
-	expr = talloc_asprintf(mem_ctx, "(attributeId=%s)", oid);
+	expr = talloc_asprintf(mem_ctx, "(attributeId=%s)", OID);
 	if (expr == NULL) {
 		goto done;
 	}
@@ -2420,7 +2420,7 @@
 	
 done:
 	DEBUG(0,("ads_get_attrname_by_oid: failed to retrieve name for oid: %s\n", 
-		oid));
+		OID));
 	
 	return NULL;
 }

Modified: trunk/source/libads/ldap.c
===================================================================
--- trunk/source/libads/ldap.c	2005-07-01 09:05:10 UTC (rev 8046)
+++ trunk/source/libads/ldap.c	2005-07-01 10:20:28 UTC (rev 8047)
@@ -2376,7 +2376,7 @@
 }
 
 
-const char *ads_get_attrname_by_oid(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char * oid)
+const char *ads_get_attrname_by_oid(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char * OID)
 {
 	ADS_STATUS rc;
 	int count = 0;
@@ -2384,11 +2384,11 @@
 	char *expr = NULL;
 	const char *attrs[] = { "lDAPDisplayName", NULL };
 
-	if (ads == NULL || mem_ctx == NULL || oid == NULL) {
+	if (ads == NULL || mem_ctx == NULL || OID == NULL) {
 		goto done;
 	}
 
-	expr = talloc_asprintf(mem_ctx, "(attributeId=%s)", oid);
+	expr = talloc_asprintf(mem_ctx, "(attributeId=%s)", OID);
 	if (expr == NULL) {
 		goto done;
 	}
@@ -2408,7 +2408,7 @@
 	
 done:
 	DEBUG(0,("ads_get_attrname_by_oid: failed to retrieve name for oid: %s\n", 
-		oid));
+		OID));
 	
 	return NULL;
 }