Fix LDAP error management in case of bad search filters. Originally

reported for squid_ldap_group by Gerard Eviston

diff --git a/helpers/basic_auth/LDAP/squid_ldap_auth.c b/helpers/basic_auth/LDAP/squid_ldap_auth.c
index 64a5a8b66d8e17a9ad2ef373dc5b176d7fa6d8ec..e8220d9db3af6d0f84741a5651aff68035bcee52 100644 (file)
--- a/helpers/basic_auth/LDAP/squid_ldap_auth.c
+++ b/helpers/basic_auth/LDAP/squid_ldap_auth.c
@@ -383,8 +383,8 @@ checkLDAP(LDAP * ld, char *userid, char *password)
            }
        }
        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);
+       rc = ldap_search_s(ld, basedn, searchscope, filter, searchattr, 1, &res);
+       if (rc != LDAP_SUCCESS) {
            if (noreferrals && rc == LDAP_PARTIAL_RESULTS) {
                /* Everything is fine. This is expected when referrals
                 * are disabled.