From: Joe Orton <jorton@apache.org>
Date: Wed, 3 Aug 2005 20:01:32 +0000 (+0000)
Subject: * modules/experimental/util_ldap.c (util_ldap_connection_open): Set
X-Git-Tag: 2.0.55~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b94e5806c9b0b1207e8a8ff1432dfb67fb9594c7;p=thirdparty%2Fapache%2Fhttpd.git

* modules/experimental/util_ldap.c (util_ldap_connection_open): Set
connection timeout on the connection, not globally, avoiding segfaults
in older version of OpenLDAP (ITS #3487).

Submitted by: Brad Nicholes
Reviewed by: jorton, wrowe


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

diff --git a/CHANGES b/CHANGES
index 90e52306469..ae443f01997 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.55
 
+  *) mod_ldap: Avoid segfaults when opening connections if using a version
+     of OpenLDAP older than 2.2.21.  [Brad Nicholes]
+
   *) mod_ssl: Fix build with OpenSSL 0.9.8.  PR 35757.  [William Rowe]
 
   *) SECURITY: CAN-2005-2088
diff --git a/STATUS b/STATUS
index fb0e1054d14..e9ce97ef46d 100644
--- a/STATUS
+++ b/STATUS
@@ -388,11 +388,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev
         +1: pquerna
 
-     *) mod_ldap: Fix for use of OpenLDAP < 2.2.21
-        (regression since 2.0.54)
-        http://people.apache.org/~jorton/ap_ldapver2.diff
-        +1: jorton
-
      *) mod_ldap: Fix cache corruption case.
         http://svn.apache.org/viewcvs?rev=225746&view=rev
         PR: 34209
diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 3af630bca46..075bbb5b4ea 100644
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -325,7 +325,7 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r,
         }
 
         if (st->connectionTimeout >= 0) {
-            rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut);
+            rc = ldap_set_option(ldc->ldap, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut);
             if (APR_SUCCESS != rc) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                                  "LDAP: Could not set the connection timeout" );