diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | include/apr_ldap.h.in | 12 | ||||
| -rw-r--r-- | include/apr_ldap.hw | 12 |
3 files changed, 21 insertions, 8 deletions
@@ -3,6 +3,11 @@ Changes with APR-util 2.0.0 Changes with APR-util 1.4.0 + *) APR_LDAP_SIZELIMIT should prefer LDAP_DEFAULT_LIMIT/-1 when the + SDK supports it, but in the absence of LDAP_DEFAULT_LIMIT (and + LDAP_NO_LIMIT/0) it is not safe to use a literal -1. + PR23356 [Eric Covener] + *) Fix apr_memcache_multgetp memory corruption and incorrect error handling. PR 46588 [Sami Tolvanen <sami.tolvanen mywot.com>] diff --git a/include/apr_ldap.h.in b/include/apr_ldap.h.in index c757e061..6087783d 100644 --- a/include/apr_ldap.h.in +++ b/include/apr_ldap.h.in @@ -102,17 +102,21 @@ /* * For ldap function calls that input a size limit on the number of returned elements * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0) + * LDAP_DEFAULT_LIMIT is preferred as it allows inheritance from whatever the SDK + * or process is configured for. */ -#if APR_HAS_ZOS_LDAPSDK || APR_HAS_MICROSOFT_LDAPSDK -#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT -#else #ifdef LDAP_DEFAULT_LIMIT #define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT #else -#define APR_LDAP_SIZELIMIT -1 /* equivalent to LDAP_DEFAULT_LIMIT */ +#ifdef LDAP_NO_LIMIT +#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT #endif #endif +#ifndef APR_LDAP_SIZELIMIT +#define APR_LDAP_SIZELIMIT 0 /* equivalent to LDAP_NO_LIMIT, and what goes on the wire */ +#endif + /* * z/OS is missing some defines */ diff --git a/include/apr_ldap.hw b/include/apr_ldap.hw index a5893764..c1bd0d4b 100644 --- a/include/apr_ldap.hw +++ b/include/apr_ldap.hw @@ -102,17 +102,21 @@ /* * For ldap function calls that input a size limit on the number of returned elements * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0) + * LDAP_DEFAULT_LIMIT is preferred as it allows inheritance from whatever the SDK + * or process is configured for. */ -#if APR_HAS_ZOS_LDAPSDK || APR_HAS_MICROSOFT_LDAPSDK -#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT -#else #ifdef LDAP_DEFAULT_LIMIT #define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT #else -#define APR_LDAP_SIZELIMIT -1 /* equivalent to LDAP_DEFAULT_LIMIT */ +#ifdef LDAP_NO_LIMIT +#define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT #endif #endif +#ifndef APR_LDAP_SIZELIMIT +#define APR_LDAP_SIZELIMIT 0 /* equivalent to LDAP_NO_LIMIT, and what goes on the wire */ +#endif + /* * z/OS is missing some defines */ |