LDAPS: list availability depending on SSL's presence

diff --git a/configure.ac b/configure.ac
index b0bc91cb9ad4e5df8fc58691fe28d51dfb7d66dd..774fd95ea4c606a8b38ed57f17c6d3460499312c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -864,6 +864,7 @@ if test x$CURL_DISABLE_LDAP != x1 ; then
     curl_ldap_msg="enabled (OpenLDAP)"
     if test "x$ac_cv_func_ldap_init_fd" = x""yes; then
       AC_DEFINE(USE_OPENLDAP, 1, [Use OpenLDAP-specific code])
+      AC_SUBST(USE_OPENLDAP, [1])
     fi
   fi
 fi
@@ -2700,11 +2701,11 @@ fi
 if test "x$CURL_DISABLE_TELNET" != "x1"; then
   SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS TELNET"
 fi
-if test "x$CURL_DISABLE_LDAP" != "x1"; then
+if test "x$CURL_DISABLE_LDAP" != "x1" -o "x$USE_OPENLDAP" = "x1"; then
   SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAP"
-fi
-if test "x$CURL_DISABLE_LDAPS" != "x1"; then
-  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAPS"
+  if test "x$CURL_DISABLE_LDAPS" != "x1" -o "x$USE_OPENLDAP$SSL_ENABLED" = "x11"; then
+    SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS LDAPS"
+  fi
 fi
 if test "x$CURL_DISABLE_DICT" != "x1"; then
   SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS DICT"

diff --git a/lib/url.c b/lib/url.c
index 8f95c8a66072618bd67d6c943dd2f963e2fd6436..4d1632b66cfbe15db976a4110514ee508bc830cb 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -183,7 +183,7 @@ static const struct Curl_handler * const protocols[] = {
 
 #if !defined(CURL_DISABLE_LDAP) || defined(USE_OPENLDAP)
   &Curl_handler_ldap,
-#if defined(HAVE_LDAP_SSL) || defined(USE_OPENLDAP)
+#if defined(HAVE_LDAP_SSL) || (defined(USE_OPENLDAP) && defined(USE_SSL))
   &Curl_handler_ldaps,
 #endif
 #endif

diff --git a/lib/version.c b/lib/version.c
index f9cc1f7d9504af25987e3a5719d58f4e3b250437..d482bff1e68d5b65b8f4adfaf99f117e1e5294fd 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -172,7 +172,7 @@ static const char * const protocols[] = {
 #endif
 #if !defined(CURL_DISABLE_LDAP) || defined(USE_OPENLDAP)
   "ldap",
-#if defined(HAVE_LDAP_SSL) || defined(USE_OPENLDAP)
+#if defined(HAVE_LDAP_SSL) || (defined(USE_OPENLDAP) && defined(USE_SSL))
   "ldaps",
 #endif
 #endif