From: Bradley Nicholes Date: Mon, 23 Jan 2006 16:35:25 +0000 (+0000) Subject: Set the LDAP protocol before setting extended LDAP options. [PR38146] X-Git-Tag: 2.2.1~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2818c747b3ff0511e5fd156bfab5296860780c7;p=thirdparty%2Fapache%2Fhttpd.git Set the LDAP protocol before setting extended LDAP options. [PR38146] Submitted by: Aaron Richton Reviewed by: bnicholes, wrowe, rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@371579 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 8a7c5774a67..7d0ba3a930f 100644 --- a/STATUS +++ b/STATUS @@ -95,11 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 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 diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index c0f4652de96..82ae6b4ba01 100644 --- a/modules/ldap/util_ldap.c +++ b/modules/ldap/util_ldap.c @@ -263,6 +263,9 @@ static int uldap_connection_open(request_rec *r, 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, @@ -292,9 +295,6 @@ static int uldap_connection_open(request_rec *r, /* 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 apr_ldap_set_option(ldc->pool, ldc->ldap,