From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 15 Nov 2010 09:40:48 +0000 (+1300)
Subject: Author: Markus Moeller <huaraz@moeller.plus.com>
X-Git-Tag: take1~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af920deeb4365bb39b011a20225b032eccc7591b;p=thirdparty%2Fsquid.git

Author: Markus Moeller <huaraz@moeller.plus.com>
Fix 'declaration of 'dup' shadows a global' errors.
---

diff --git a/helpers/external_acl/kerberos_ldap_group/support_group.cc b/helpers/external_acl/kerberos_ldap_group/support_group.cc
index e0568824eb..112e83ec85 100644
--- a/helpers/external_acl/kerberos_ldap_group/support_group.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_group.cc
@@ -50,7 +50,7 @@ utf8dup(struct main_args *margs)
     int c = 0, s;
     size_t n;
     char *src;
-    unsigned char *p, *dup;
+    unsigned char *p, *dupp;
 
     src = margs->glist;
     if (!src)
@@ -60,7 +60,7 @@ utf8dup(struct main_args *margs)
             c++;
     if (c != 0) {
         p = (unsigned char *) xmalloc(strlen(src) + c);
-        dup = p;
+        dupp = p;
         for (n = 0; n < strlen(src); n++) {
             s = (unsigned char) src[n];
             if (s > 127 && s < 192) {
@@ -76,8 +76,8 @@ utf8dup(struct main_args *margs)
             p++;
         }
         *p = '\0';
-        debug((char *) "%s| %s: INFO: Group %s as UTF-8: %s\n", LogTime(), PROGRAM, src, dup);
-        return (char *) dup;
+        debug((char *) "%s| %s: INFO: Group %s as UTF-8: %s\n", LogTime(), PROGRAM, src, dupp);
+        return (char *) dupp;
     } else
         return xstrdup(src);
 }