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.
This commit is contained in:
Dan Fandrich 2008-03-20 20:08:44 +00:00
parent c0a30b04c2
commit c37cdbe2cf
3 changed files with 13 additions and 0 deletions

View File

@ -6,6 +6,12 @@
Changelog 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) Michal Marek (20 Mar 2008)
- Added --with-ca-path=DIRECTORY configure option to use an openSSL CApath by - 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 default instead of a ca bundle. The configure script will also look for a

View File

@ -49,6 +49,7 @@ This release includes the following bugfixes:
lead to crash lead to crash
o SFTP upload with CURLOPT_FTP_CREATE_MISSING_DIRS on re-used connection o SFTP upload with CURLOPT_FTP_CREATE_MISSING_DIRS on re-used connection
o SFTP infinite loop when given an invalid quote command 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: This release includes the following known bugs:

View File

@ -625,6 +625,8 @@ if test x$CURL_DISABLE_LDAP != x1 ; then
AC_MSG_WARN(["$LDAPLIBNAME" is not an LDAP library: LDAP disabled]) AC_MSG_WARN(["$LDAPLIBNAME" is not an LDAP library: LDAP disabled])
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP]) AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
AC_SUBST(CURL_DISABLE_LDAP, [1])]) AC_SUBST(CURL_DISABLE_LDAP, [1])])
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
AC_SUBST(CURL_DISABLE_LDAPS, [1])
else else
dnl Try to find the right ldap libraries for this system dnl Try to find the right ldap libraries for this system
CURL_CHECK_LIBS_LDAP 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_MSG_WARN([Cannot find libraries for LDAP support: LDAP disabled])
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP]) AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
AC_SUBST(CURL_DISABLE_LDAP, [1]) AC_SUBST(CURL_DISABLE_LDAP, [1])
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
AC_SUBST(CURL_DISABLE_LDAPS, [1])
;; ;;
esac esac
fi 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_MSG_WARN(["$LBERLIBNAME" is not an LBER library: LDAP disabled])
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP]) AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
AC_SUBST(CURL_DISABLE_LDAP, [1])]) AC_SUBST(CURL_DISABLE_LDAP, [1])])
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
AC_SUBST(CURL_DISABLE_LDAPS, [1])
fi fi
fi fi
fi fi