summaryrefslogtreecommitdiffstats
path: root/source3/libads
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-07-01 10:20:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:58:09 -0500
commit3f11139bf361ecc9dbcf928c48c67f2fdb95b771 (patch)
treeb7ec1d5b603a66cef0f8b4f84d56d5aa20d754f9 /source3/libads
parent02886574aa728145b697b4d272468a402abae87a (diff)
downloadsamba-3f11139bf361ecc9dbcf928c48c67f2fdb95b771.tar.gz
samba-3f11139bf361ecc9dbcf928c48c67f2fdb95b771.tar.xz
samba-3f11139bf361ecc9dbcf928c48c67f2fdb95b771.zip
r8047: "oid" is defined in a heimdal header. With my gcc this generates a ton of
shadowed variable warnings. Fix that. Volker (This used to be commit 3846c0afa1db96239b3aaf2e7ee2427b48f6e2f0)
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/ldap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 12890154647..b3faad1fb10 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -2388,7 +2388,7 @@ static time_t ads_parse_time(const char *str)
}
-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 @@ const char *ads_get_attrname_by_oid(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const
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 @@ const char *ads_get_attrname_by_oid(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const
done:
DEBUG(0,("ads_get_attrname_by_oid: failed to retrieve name for oid: %s\n",
- oid));
+ OID));
return NULL;
}