httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject svn commit: r371579 - in /httpd/httpd/branches/2.2.x: STATUS modules/ldap/util_ldap.c
Date Mon, 23 Jan 2006 16:35:29 GMT
Author: bnicholes
Date: Mon Jan 23 08:35:25 2006
New Revision: 371579

URL: http://svn.apache.org/viewcvs?rev=371579&view=rev
Log:
Set the LDAP protocol before setting extended LDAP options. [PR38146]

Submitted by: Aaron Richton <richton nbcs.rutgers.edu>
Reviewed by: bnicholes, wrowe, rpluem

Modified:
    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/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=371579&r1=371578&r2=371579&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Jan 23 08:35:25 2006
@@ -95,11 +95,6 @@
       Message-ID: <4395A056.2070000@web.turner.com>
       +1: jerenkrantz, jim, wrowe
 
-    * mod_ldap: Set the LDAP protocol before setting extended LDAP options
-       Fix PR38146
-         http://svn.apache.org/viewcvs.cgi?rev=370856&view=rev
-      +1: bnicholes, wrowe, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init

Modified: httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c?rev=371579&r1=371578&r2=371579&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/util_ldap.c Mon Jan 23 08:35:25 2006
@@ -263,6 +263,9 @@
             return(result->rc);
         }
 
+        /* always default to LDAP V3 */
+        ldap_set_option(ldc->ldap, LDAP_OPT_PROTOCOL_VERSION, &version);
+
         /* set client certificates */
         if (!apr_is_empty_array(ldc->client_certs)) {
             apr_ldap_set_option(ldc->pool, ldc->ldap, APR_LDAP_OPT_TLS_CERT,
@@ -291,9 +294,6 @@
 
         /* Set the alias dereferencing option */
         ldap_set_option(ldc->ldap, LDAP_OPT_DEREF, &(ldc->deref));
-
-        /* always default to LDAP V3 */
-        ldap_set_option(ldc->ldap, LDAP_OPT_PROTOCOL_VERSION, &version);
 
 /*XXX All of the #ifdef's need to be removed once apr-util 1.2 is released */
 #ifdef APR_LDAP_OPT_VERIFY_CERT



Mime
View raw message