aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac9
-rw-r--r--lib/url.c2
-rw-r--r--lib/version.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index b0bc91cb9..774fd95ea 100644
--- 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 8f95c8a66..4d1632b66 100644
--- 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 f9cc1f7d9..d482bff1e 100644
--- 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