From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Wed, 21 Jul 2010 06:18:25 +0000 (-0600)
Subject: Author: isaac <isaacarsenal@gmail.com>
X-Git-Tag: SQUID_3_2_0_1~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e0f1358f7929f803cdc23dbe88db6a6d2a7ddfb;p=thirdparty%2Fsquid.git

Author: isaac <isaacarsenal@gmail.com>
Bug 2985: search scope for digest_ldap_auth didn't work
---

diff --git a/helpers/digest_auth/LDAP/ldap_backend.cc b/helpers/digest_auth/LDAP/ldap_backend.cc
index d305c01a8f..25abcb16ea 100644
--- a/helpers/digest_auth/LDAP/ldap_backend.cc
+++ b/helpers/digest_auth/LDAP/ldap_backend.cc
@@ -238,11 +238,11 @@ retrysrch:
                 }
             }
         } else if (userdnattr) {
-            snprintf(searchbase, 8192, "%s=%s, %s", userdnattr, login, userbasedn);
+            snprintf(filter,8192,"%s=%s",userdnattr,login);
 
 retrydnattr:
-            debug("searchbase '%s'\n", searchbase);
-            rc = ldap_search_s(ld, searchbase, searchscope, NULL, NULL, 0, &res);
+            debug("searchbase '%s'\n", userbasedn);
+            rc = ldap_search_s(ld, userbasedn, searchscope, filter, NULL, 0, &res);
         }
         if (rc == LDAP_SUCCESS) {
             entry = ldap_first_entry(ld, res);