Commit c37cdbe2 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed a problem where curl-config --protocols could erroneously show LDAPS 

support when curl didn't even have regular LDAP support.  It looks like
this could happen when the --enable-ldaps configure switch is given but
configure couldn't find the LDAP headers or libraries.
parent c0a30b04

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 


                                  Changelog



Daniel Fandrich (20 Mar 2008)

- Fixed a problem where curl-config --protocols could erroneously show LDAPS

  support when curl didn't even have regular LDAP support.  It looks like

  this could happen when the --enable-ldaps configure switch is given but

  configure couldn't find the LDAP headers or libraries.



Michal Marek (20 Mar 2008)

- Added --with-ca-path=DIRECTORY configure option to use an openSSL CApath by

  default instead of a ca bundle. The configure script will also look for a

RELEASE-NOTES

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ This release includes the following bugfixes: 
   lead to crash

 o SFTP upload with CURLOPT_FTP_CREATE_MISSING_DIRS on re-used connection

 o SFTP infinite loop when given an invalid quote command

 o curl-config erroneously reported LDAPS support with missing LDAP libraries



This release includes the following known bugs:

configure.ac

+6 −0
Original line number Diff line number Diff line
@@ -625,6 +625,8 @@ if test x$CURL_DISABLE_LDAP != x1 ; then 
      AC_MSG_WARN(["$LDAPLIBNAME" is not an LDAP library: LDAP disabled])

      AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])

      AC_SUBST(CURL_DISABLE_LDAP, [1])])

      AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])

      AC_SUBST(CURL_DISABLE_LDAPS, [1])

  else

    dnl Try to find the right ldap libraries for this system

    CURL_CHECK_LIBS_LDAP
@@ -633,6 +635,8 @@ if test x$CURL_DISABLE_LDAP != x1 ; then 
        AC_MSG_WARN([Cannot find libraries for LDAP support: LDAP disabled])

        AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])

        AC_SUBST(CURL_DISABLE_LDAP, [1])

        AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])

        AC_SUBST(CURL_DISABLE_LDAPS, [1])

        ;;

    esac

  fi
@@ -648,6 +652,8 @@ if test x$CURL_DISABLE_LDAP != x1 ; then 
        AC_MSG_WARN(["$LBERLIBNAME" is not an LBER library: LDAP disabled])

        AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])

        AC_SUBST(CURL_DISABLE_LDAP, [1])])

        AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])

        AC_SUBST(CURL_DISABLE_LDAPS, [1])

    fi

  fi

fi