Commit b1c1b9bb authored by Howard Chu's avatar Howard Chu Committed by Daniel Stenberg
Browse files

LDAPS: list availability depending on SSL's presence

parent 123f80ae

configure.ac

+5 −4
Original line number Diff line number Diff line
@@ -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,12 +2701,12 @@ 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

  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"

fi

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/version.c

+1 −1
Original line number Diff line number Diff line
@@ -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