Commit 29f08985 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed libcurl to honour the --disable-ldaps configure option

parent 0e74e1d8

lib/curl_ldap.h

+3 −2
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#ifndef CURL_DISABLE_LDAP

extern const struct Curl_handler Curl_handler_ldap;



#if (defined(USE_OPENLDAP) && defined(USE_SSL)) || \

   (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL))

#if !defined(CURL_DISABLE_LDAPS) && \

    ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \

     (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))

extern const struct Curl_handler Curl_handler_ldaps;

#endif

lib/url.c

+3 −2
Original line number Diff line number Diff line
@@ -184,8 +184,9 @@ static const struct Curl_handler * const protocols[] = { 


#ifndef CURL_DISABLE_LDAP

  &Curl_handler_ldap,

#if (defined(USE_OPENLDAP) && defined(USE_SSL)) || \

   (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL))

#if !defined(CURL_DISABLE_LDAPS) && \

    ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \

     (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))

  &Curl_handler_ldaps,

#endif

#endif

lib/version.c

+3 −2
Original line number Diff line number Diff line
@@ -180,8 +180,9 @@ static const char * const protocols[] = { 
#endif

#ifndef CURL_DISABLE_LDAP

  "ldap",

#if (defined(USE_OPENLDAP) && defined(USE_SSL)) || \

   (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL))

#if !defined(CURL_DISABLE_LDAPS) && \

    ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \

     (!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))

  "ldaps",

#endif

#endif