From f01effcaea3a12dece971ff3bb783273088bea80 Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Tue, 13 Mar 2007 17:53:22 +0000 Subject: [PATCH] Remove the hardcoded size limit parameter for ldap_search_ext_s and replace it with an APR_ defined value that is set according to the LDAP SDK being used. Submitted by: David Jones git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@517788 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ldap/util_ldap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index ddc241e038..59449d0119 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -52,8 +52,13 @@ #define LDAP_CA_TYPE_BASE64 2 #define LDAP_CA_TYPE_CERT7_DB 3 -#ifndef LDAP_NO_LIMIT -#define LDAP_NO_LIMIT -1 +/* Default define for ldap functions that need a SIZELIMIT but + * do not have the define + * XXX This should be removed once a supporting #define is + * released through APR-Util. + */ +#ifndef APR_LDAP_SIZELIMIT +#define APR_LDAP_SIZELIMIT -1 #endif module AP_MODULE_DECLARE_DATA ldap_module; @@ -660,7 +665,7 @@ start_over: /* search for reqdn */ if ((result = ldap_search_ext_s(ldc->ldap, (char *)reqdn, LDAP_SCOPE_BASE, "(objectclass=*)", NULL, 1, - NULL, NULL, NULL, LDAP_NO_LIMIT, &res)) + NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res)) == LDAP_SERVER_DOWN) { ldc->reason = "DN Comparison ldap_search_ext_s() " @@ -938,7 +943,7 @@ start_over: if ((result = ldap_search_ext_s(ldc->ldap, (char *)basedn, scope, (char *)filter, attrs, 0, - NULL, NULL, NULL, LDAP_NO_LIMIT, &res)) + NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res)) == LDAP_SERVER_DOWN) { ldc->reason = "ldap_search_ext_s() for user failed with server down"; @@ -1178,7 +1183,7 @@ start_over: if ((result = ldap_search_ext_s(ldc->ldap, (char *)basedn, scope, (char *)filter, attrs, 0, - NULL, NULL, NULL, LDAP_NO_LIMIT, &res)) + NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res)) == LDAP_SERVER_DOWN) { ldc->reason = "ldap_search_ext_s() for user failed with server down"; -- 2.40.0