Commit 81e0a62c authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Set the LDAP protocol before setting extended LDAP options. [PR38146] 

Submitted by: Aaron Richton <richton nbcs.rutgers.edu>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@370856 13f79535-47bb-0310-9956-ffa450edef68
parent 5c3b887a

modules/ldap/util_ldap.c

+3 −3
Changes for modules/ldap/util_ldap.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -264,6 +264,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,
@@ -293,9 +296,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,