You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/04/10 14:35:02 UTC
svn commit: r527105 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/ldap/util_ldap.c
Author: jim
Date: Tue Apr 10 05:35:00 2007
New Revision: 527105
URL: http://svn.apache.org/viewvc?view=rev&rev=527105
Log:
Apply approved backport
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=527105&r1=527104&r2=527105
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Apr 10 05:35:00 2007
@@ -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>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=527105&r1=527104&r2=527105
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Apr 10 05:35:00 2007
@@ -77,12 +77,6 @@
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.
Modified: httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c?view=diff&rev=527105&r1=527104&r2=527105
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c Tue Apr 10 05:35:00 2007
@@ -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 @@
/* 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 @@
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 @@
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";