Full LDAP search filter specifications in -f

diff --git a/helpers/basic_auth/LDAP/squid_ldap_auth.c b/helpers/basic_auth/LDAP/squid_ldap_auth.c
index b3a30c2ca74c095926322b9feb88c52804312048..1f3c30f430a1bdc00246a95fdb2ed466c2681d7c 100644 (file)
--- a/helpers/basic_auth/LDAP/squid_ldap_auth.c
+++ b/helpers/basic_auth/LDAP/squid_ldap_auth.c
@@ -33,6 +33,8 @@
  *             - Added -a to control alias dereferencing
  * 2001-04-17: Henrik Nordstrom <hno@squid-cache.org>
  *             - Added -u, DN username attribute name
+ * 2001-04-18: Henrik Nordstrom <hno@squid-cache.org>
+ *             - Allow full filter specifications in -f
  */
 
 #include <stdio.h>
@@ -228,7 +230,7 @@ checkLDAP(LDAP * ld, char *userid, char *password)
                return 1;
            }
        }
-       snprintf(filter, sizeof(filter), "%s%s", searchfilter, userid);
+       snprintf(filter, sizeof(filter), searchfilter, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid, userid);
        if (ldap_search_s(ld, basedn, searchscope, filter, searchattr, 1, &res) != LDAP_SUCCESS) {
            int rc = ldap_result2error(ld, res, 0);
            if (noreferrals && rc == LDAP_PARTIAL_RESULTS) {