Apply approved backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@527105 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index bd22d927b144b5a2be8dd71b714e4935a5ed355d..eb9232b2ff4e718bd12e899f97acdee3c86ddd75 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+   * mod_ldap: 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.
+     [David Jones <oscaremma gmail com>]
+
   *) core: Correct a regression since 2.0.x in the handling of AllowOverride 
      Options.  PR 41829.  [Torsten Förtsch <torsten.foertsch gmx.net>]
 

diff --git a/STATUS b/STATUS
index cb7e51e365444bdd34f0cfd6cacf6c0cb8230d8c..1616d92b9deacdfb7d89043388d2e4e33985a88a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -77,12 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_ldap: 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.
-     http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?r1=484985&r2=517788
-     +1: bnicholes, rpluem, jim
-
    * mod_proxy_balancer: Remove unnecessary lock/unlock for
      the post_request hook. We are actually doing nothing here.
      But keep the code (but macroed out) for future usage.

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index b13bb9e5c97d3d3cc6b86bf17af2471fbdf5115c..414372b5b716c15bc5b82ac0ba415812fcae42b0 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -52,6 +52,14 @@
 #define LDAP_CA_TYPE_BASE64             2
 #define LDAP_CA_TYPE_CERT7_DB           3
 
+/* 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;
 
@@ -656,7 +664,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, -1, &res))
+                                    NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res))
             == LDAP_SERVER_DOWN)
     {
         ldc->reason = "DN Comparison ldap_search_ext_s() "
@@ -934,7 +942,7 @@ start_over:
     if ((result = ldap_search_ext_s(ldc->ldap,
                                     (char *)basedn, scope,
                                     (char *)filter, attrs, 0,
-                                    NULL, NULL, NULL, -1, &res))
+                                    NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res))
             == LDAP_SERVER_DOWN)
     {
         ldc->reason = "ldap_search_ext_s() for user failed with server down";
@@ -1174,7 +1182,7 @@ start_over:
     if ((result = ldap_search_ext_s(ldc->ldap,
                                     (char *)basedn, scope,
                                     (char *)filter, attrs, 0,
-                                    NULL, NULL, NULL, -1, &res))
+                                    NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res))
             == LDAP_SERVER_DOWN)
     {
         ldc->reason = "ldap_search_ext_s() for user failed with server down";