curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-28 23:16:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Fandrich 2011-03-07 17:45:33 -08:00
parent 0e74e1d8d8
commit 29f0898525
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/curl_ldap.h
View File

@ -25,8 +25,9 @@
#ifndef CURL_DISABLE_LDAP #ifndef CURL_DISABLE_LDAP
extern const struct Curl_handler Curl_handler_ldap; extern const struct Curl_handler Curl_handler_ldap;
#if (defined(USE_OPENLDAP) && defined(USE_SSL)) || \ #if !defined(CURL_DISABLE_LDAPS) && \
(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)) ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \
(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))
extern const struct Curl_handler Curl_handler_ldaps; extern const struct Curl_handler Curl_handler_ldaps;
#endif #endif

5
lib/url.c
View File

@ -184,8 +184,9 @@ static const struct Curl_handler * const protocols[] = {
#ifndef CURL_DISABLE_LDAP #ifndef CURL_DISABLE_LDAP
&Curl_handler_ldap, &Curl_handler_ldap,
#if (defined(USE_OPENLDAP) && defined(USE_SSL)) || \ #if !defined(CURL_DISABLE_LDAPS) && \
(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)) ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \
(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))
&Curl_handler_ldaps, &Curl_handler_ldaps,
#endif #endif
#endif #endif

5
lib/version.c
View File

@ -180,8 +180,9 @@ static const char * const protocols[] = {
#endif #endif
#ifndef CURL_DISABLE_LDAP #ifndef CURL_DISABLE_LDAP
"ldap", "ldap",
#if (defined(USE_OPENLDAP) && defined(USE_SSL)) || \ #if !defined(CURL_DISABLE_LDAPS) && \
(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)) ((defined(USE_OPENLDAP) && defined(USE_SSL)) || \
(!defined(USE_OPENLDAP) && defined(HAVE_LDAP_SSL)))
"ldaps", "ldaps",
#endif #endif
#endif #endif