Re: util_ldap.c use of hardcoded sizelimit on ldap_search_ext_s causing error
Brad Nicholes <BNICHOLES <at> novell.com>
2007-03-02 20:03:06 GMT
Looks good, I think I like your first suggestion better, putting the #ifdef in apr_ldap.h.in. This seems a
little more straight forward rather than hiding the value in configure.
Brad
>>> On 3/1/2007 at 7:07 PM, in message
<3ce0569d0703011807g15dcba1eq20bb20c57df6774b <at> mail.gmail.com>, "David Jones"
<oscaremma <at> gmail.com> wrote:
> How about:
> changes to apr_ldap.h.in:
> #define APR_HAS_ZOS_LDAPSDK <at> apu_has_ldap_zos <at>
>
> #if APR_LDAP_HAS_ZOS_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 */
> #endif
> #endif
>
>
> This part of the util_ldap.c patch at the bottom could allow util_ldap.c to
> compile regardless of apr-util level, but would not typically commit it?
> +#ifndef APR_LDAP_SIZELIMIT
> +#define APR_LDAP_SIZELIMIT -1
> #endif
>
>
>
> Or could add info to apu-conf.m4 for each SDK, eliminating the need for the
> ZOS specific #if (would just need #define APR_LDAP_SIZELIMIT
> <at> apu_ldap_sizelimit)
> (If get any input from other SDKs then could replace its -1 with
> LDAP_DEFAULT_LIMIT or LDAP_NO_LIMIT as i did for z/OS)
>
> Index: apu-conf.m4
> ===================================================================
> RCS file: /m0xa/cvs/phoenix/2.2.4/srclib/apr-util/build/apu-conf.m4,v
> retrieving revision 1.2
> diff -u -d -b -r1.2 apu-conf.m4
> --- apu-conf.m4 12 Feb 2007 18:19:20 -0000 1.2
> +++ apu-conf.m4 1 Mar 2007 20:07:26 -0000
>
> <at> <at> -267,10 +273,13 <at> <at>
> apu_has_ldap_sslinit="0"
> apu_has_ldapssl_install_routines="0"
> apu_has_ldap_openldap="0"
> +apu_has_ldap_sizelimit="0"
> <at> <at> -354,42 +363,57 <at> <at>
> AC_EGREP_CPP([OpenLDAP], [$lber_h
> $ldap_h
> LDAP_VENDOR_NAME], [apu_has_ldap_openldap="1"
> + apu_ldap_sizelimit="-1"
> apr_cv_ldap_toolkit="OpenLDAP"])
> fi
> if test "x$apr_cv_ldap_toolkit" = "x"; then
> AC_EGREP_CPP([Sun Microsystems Inc.], [$lber_h
> $ldap_h
> LDAP_VENDOR_NAME], [apu_has_ldap_solaris="1"
> + apu_ldap_sizelimit="-1"
> apr_cv_ldap_toolkit="Solaris"])
> fi
> if test "x$apr_cv_ldap_toolkit" = "x"; then
> AC_EGREP_CPP([Novell], [$lber_h
> $ldap_h
> LDAP_VENDOR_NAME], [apu_has_ldap_novell="1"
> + apu_ldap_sizelimit="-1"
> apr_cv_ldap_toolkit="Novell"])
> fi
> if test "x$apr_cv_ldap_toolkit" = "x"; then
> AC_EGREP_CPP([Microsoft Corporation.], [$lber_h
> $ldap_h
> LDAP_VENDOR_NAME], [apu_has_ldap_microsoft="1"
> + apu_ldap_sizelimit="-1"
>
> apr_cv_ldap_toolkit="Microsoft"])
> fi
> if test "x$apr_cv_ldap_toolkit" = "x"; then
> AC_EGREP_CPP([Netscape Communications Corp.], [$lber_h
> $ldap_h
> LDAP_VENDOR_NAME], [apu_has_ldap_netscape="1"
> + apu_ldap_sizelimit="-1"
> apr_cv_ldap_toolkit="Netscape"])
> fi
> if test "x$apr_cv_ldap_toolkit" = "x"; then
> AC_EGREP_CPP([mozilla.org], [$lber_h
> $ldap_h
> LDAP_VENDOR_NAME], [apu_has_ldap_mozilla="1"
> + apu_ldap_sizelimit="-1"
> apr_cv_ldap_toolkit="Mozilla"])
> fi
> if test "x$apr_cv_ldap_toolkit" = "x"; then
> + AC_EGREP_CPP([IBM], [$lber_h
> + $ldap_h
> + LDAP_VENDOR_NAME], [apu_has_ldap_zos="1"
> +
> apu_ldap_sizelimit="LDAP_NO_LIMIT"
> + apr_cv_ldap_toolkit="ZOS"])
> + fi
> + if test "x$apr_cv_ldap_toolkit" = "x"; then
> apu_has_ldap_other="1"
> + apu_ldap_sizelimit="-1"
> apr_cv_ldap_toolkit="unknown"
> fi
> +
> ])
> fi
>
> <at> <at> -398,15 +422,20 <at> <at>
> LIBS=$save_libs
> ])
>
> +AC_SUBST(apu_ldap_sizelimit)
> AC_SUBST(ldap_h)
> AC_SUBST(lber_h)
> AC_SUBST(ldap_ssl_h)
>
> <at> <at> -415,6 +444,7 <at> <at>
> AC_SUBST(apu_has_ldap_microsoft)
> AC_SUBST(apu_has_ldap_netscape)
> AC_SUBST(apu_has_ldap_mozilla)
> +AC_SUBST(apu_has_ldap_zos)
> AC_SUBST(apu_has_ldap_other)
>
> ])
>
>
>
>
> And finally this same either way except for the question on #ifndef
> APR_LDAP_SIZELIMIT
> Index: util_ldap.c
> ===================================================================
> RCS file: /m0xa/cvs/phoenix/2.2.4/modules/ldap/util_ldap.c,v
> retrieving revision 1.3
> diff -u -d -b -r1.3 util_ldap.c
> --- util_ldap.c 15 Feb 2007 18:55:41 -0000 1.3
> +++ util_ldap.c 1 Mar 2007 20:19:39 -0000
> <at> <at> -45,15 +45,8 <at> <at>
> #include "unixd.h"
> #endif
>
> -#ifndef LDAP_NO_LIMIT
> -#define LDAP_NO_LIMIT -1
> +#ifndef APR_LDAP_SIZELIMIT
> +#define APR_LDAP_SIZELIMIT -1
> #endif
>
> module AP_MODULE_DECLARE_DATA ldap_module;
> <at> <at> -681,7 +681,7 <at> <at>
> /* 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() "
> <at> <at> -960,13 +961,14 <at> <at>
> 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";
>
> <at> <at> -1200,14 +1202,14 <at> <at>
> 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"
RSS Feed