From: hno <>
Date: Sat, 1 Mar 2003 21:55:11 +0000 (+0000)
Subject: Fix LDAP error management in case of bad search filters. Originally
X-Git-Tag: SQUID_3_0_PRE1~304
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e9ab9a6f0e13a9f1f1ed66738264edb7dc5884c;p=thirdparty%2Fsquid.git

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 64a5a8b66d..e8220d9db3 100644
--- 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.