Commit 6227ea7a authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

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 <oscaremma gmail com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@517788 13f79535-47bb-0310-9956-ffa450edef68
parent ad43e894

modules/ldap/util_ldap.c

+10 −5
Original line number Diff line number Diff line
@@ -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";