More strict search error filtering. Only ignore search errors when

errors are expected.

diff --git a/helpers/basic_auth/LDAP/squid_ldap_auth.c b/helpers/basic_auth/LDAP/squid_ldap_auth.c
index 7ccc5dcc3d2e6c95e38e5c8a6b5185c7f33a651c..d35b95be031fb2a9093b11c339cead67a330b1d1 100644 (file)
--- a/helpers/basic_auth/LDAP/squid_ldap_auth.c
+++ b/helpers/basic_auth/LDAP/squid_ldap_auth.c
@@ -224,12 +224,11 @@ checkLDAP(LDAP * ld, char *userid, char *password)
        snprintf(filter, sizeof(filter), "%s%s", searchfilter, userid);
        if (ldap_search_s(ld, basedn, searchscope, filter, searchattr, 1, &res) != LDAP_SUCCESS) {
            int rc = ldap_result2error(ld, res, 0);
-           if (rc != LDAP_PARTIAL_RESULTS) {
-               /* LDAP_PARTIAL_RESULT ignored. What we are looking for
-                * is most likely availale
-                * This error is seen when querying a MS ActiveDirector
-                * server due to referrals..
+           if (noreferrals && rc == LDAP_PARTIAL_RESULTS) {
+               /* Everything is fine. This is expected when referrals
+                * are disabled.
                 */
+           } else {
                fprintf(stderr, "squid_ldap_auth: WARNING, LDAP search error '%s'\n", ldap_err2string(rc));
            }
        }