From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 30 Apr 2010 05:48:30 +0000 (+0200)
Subject: Fixed symbol clash in group ldap authorization helper.
X-Git-Tag: SQUID_3_2_0_1~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=574c01ba57388d521d95a07d97f75a83f8d74e1a;p=thirdparty%2Fsquid.git

Fixed symbol clash in group ldap authorization helper.
---

diff --git a/helpers/external_acl/ldap_group/squid_ldap_group.c b/helpers/external_acl/ldap_group/squid_ldap_group.c
index 3ed81fc2d0..5336997024 100644
--- a/helpers/external_acl/ldap_group/squid_ldap_group.c
+++ b/helpers/external_acl/ldap_group/squid_ldap_group.c
@@ -97,7 +97,7 @@ static const char *bindpasswd = NULL;
 static int searchscope = LDAP_SCOPE_SUBTREE;
 static int persistent = 0;
 static int noreferrals = 0;
-static int debug = 0;
+static int show_debug_messages = 0;
 static int aliasderef = LDAP_DEREF_NEVER;
 #if defined(NETSCAPE_SSL)
 static char *sslpath = NULL;
@@ -368,7 +368,7 @@ main(int argc, char **argv)
             break;
 #endif
         case 'd':
-            debug = 1;
+            show_debug_messages = 1;
             break;
         case 'g':
             use_extension_dn = 1;
@@ -573,7 +573,7 @@ recover:
                         break;
                     }
                 }
-                if (debug)
+                if (show_debug_messages)
                     fprintf(stderr, "Connected OK\n");
             }
             if (searchLDAP(ld, group, user, extension_dn) == 0) {
@@ -707,7 +707,7 @@ searchLDAPGroup(LDAP * ld, char *group, char *member, char *extension_dn)
         fprintf(stderr, PROGRAM_NAME " ERROR, Failed to construct LDAP search filter. filter=\"%s\", user=\"%s\", group=\"%s\"\n", filter, member, group);
         return 1;
     }
-    if (debug)
+    if (show_debug_messages)
         fprintf(stderr, "group filter '%s', searchbase '%s'\n", filter, searchbase);
 
     rc = ldap_search_s(ld, searchbase, searchscope, filter, searchattr, 1, &res);
@@ -756,7 +756,7 @@ searchLDAP(LDAP * ld, char *group, char *login, char *extension_dn)
             snprintf(searchbase, sizeof(searchbase), "%s", userbasedn ? userbasedn : basedn);
         ldap_escape_value(escaped_login, sizeof(escaped_login), login);
         snprintf(filter, sizeof(filter), usersearchfilter, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login, escaped_login);
-        if (debug)
+        if (show_debug_messages)
             fprintf(stderr, "user filter '%s', searchbase '%s'\n", filter, searchbase);
         rc = ldap_search_s(ld, searchbase, searchscope, filter, searchattr, 1, &res);
         if (rc != LDAP_SUCCESS) {