diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2011-03-07 17:45:33 -0800 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2011-03-07 17:45:33 -0800 |
| commit | 29f0898525bf48292606f098bee33ce8f1f58781 (patch) | |
| tree | a50787b8720e53d8e745805535c31a5f277d1644 | |
| parent | 0e74e1d8d83d50ba1d411903ae2dbba13a71bdeb (diff) | |
Fixed libcurl to honour the --disable-ldaps configure option
| -rw-r--r-- | lib/curl_ldap.h | 5 | ||||
| -rw-r--r-- | lib/url.c | 5 | ||||
| -rw-r--r-- | lib/version.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/curl_ldap.h b/lib/curl_ldap.h index 3cce4bf7b..4cd13cfd2 100644 --- a/lib/curl_ldap.h +++ b/lib/curl_ldap.h @@ -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 @@ -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 diff --git a/lib/version.c b/lib/version.c index 52989cdc6..97dd16395 100644 --- a/lib/version.c +++ b/lib/version.c @@ -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 |