Commit 727f9ce5 authored by Graham Leggett's avatar Graham Leggett
Browse files

Fix a problem where SSL was started twice when no client certificates were 

specified.


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

modules/ldap/util_ldap.c

+3 −0
Changes for modules/ldap/util_ldap.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -310,6 +310,8 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r, 
        }



        /* switch on SSL/TLS */

        if (!apr_is_empty_array(ldc->client_certs)) {



            apr_ldap_set_option(ldc->pool, ldc->ldap, 

                                APR_LDAP_OPT_TLS, &ldc->secure, &(result));

            if (LDAP_SUCCESS != result->rc) {
@@ -319,6 +321,7 @@ LDAP_DECLARE(int) util_ldap_connection_open(request_rec *r, 
                ldc->reason = result->reason;

                return(result->rc);

            }

        }



        /* Set the alias dereferencing option */

        ldap_set_option(ldc->ldap, LDAP_OPT_DEREF, &(ldc->deref));