moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

LDAPS: list availability depending on SSL's presence

Browse Source
This commit is contained in:
Howard Chu 2010-05-28 12:23:28 +02:00 committed by Daniel Stenberg
parent 123f80ae54
commit b1c1b9bb76
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -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"

2
lib/url.c
View File

@ -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

2
lib/version.c
View File

@ -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