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

diff --git a/lib/curl_ldap.h b/lib/curl_ldap.h
index 3cce4bf7b09d11b35c075d11e6c2c5417c1cab38..4cd13cfd269953147c482013e22b79217d607543 100644 (file)
--- 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
 

diff --git a/lib/url.c b/lib/url.c
index c1dab825464f3b050e7983c6aaf94daad030ddd6..5af0071726207028481fe834dbb1cd777b7c939e 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -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 52989cdc6f7fe123179a7df767a246a232af0535..97dd16395e165a56629ff0f7808afbad0f46b0c1 100644 (file)
--- 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