Commit 43d20d81 authored by Yang Tse's avatar Yang Tse
Browse files

Enable OpenLDAP support for cygwin builds. 

Enable OpenLDAP support for cygwin builds. This support was disabled back
in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers.
cygwin's OpenSSL 0.9.8l and OpenLDAP 2.3.43 versions on cygwin 1.5.25
allow building an OpenLDAP enabled libcurl supporting back to Windows 95.

Remove non-functional CURL_LDAP_HYBRID code and references.
parent bc0f3dd1

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ 


                                  Changelog



Yang Tse (4 June 2010)

- Enabled OpenLDAP support for cygwin builds. This support was disabled back

  in 2008 due to incompatibilities between OpenSSL and OpenLDAP headers.

  cygwin's OpenSSL 0.9.8l and OpenLDAP 2.3.43 versions on cygwin 1.5.25

  allow building an OpenLDAP enabled libcurl supporting back to Windows 95.



  Removed the non-functional CURL_LDAP_HYBRID code and references.



Daniel Stenberg (2 June 2010)

- Jason McDonald posted bug report #3006786 when he found that the SFTP code

  didn't timeout properly in several places in the code even if a timeout was

CMakeLists.txt

+2 −7
Original line number Diff line number Diff line
@@ -120,16 +120,11 @@ if(WIN32) 
  if( NOT HAVE_WLDAP32)

    set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE)

    message(STATUS "wldap32 not found CURL_DISABLE_LDAP set ON")

    option(CURL_LDAP_WIN "Use W$ LDAP implementation" OFF)

    option(CURL_LDAP_WIN "Use Windows LDAP implementation" OFF)

  else()

    option(CURL_LDAP_WIN "Use W$ LDAP implementation" ON)

    option(CURL_LDAP_WIN "Use Windows LDAP implementation" ON)

  endif()

  mark_as_advanced(CURL_LDAP_WIN)

  set(CURL_LDAP_HYBRID OFF)

else()

  option(CURL_LDAP_HYBRID "W$ LDAP with non-W$ compiler" OFF)

  mark_as_advanced(CURL_LDAP_HYBRID)

  set(CURL_LDAP_WIN OFF)

endif()



if(HTTP_ONLY)

RELEASE-NOTES

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ This release includes the following changes: 
 o added support for FTP wildcard matching and downloads

 o added support for RTMP

 o introducing new LDAP code for new enough OpenLDAP

 o OpenLDAP support enabled for cygwin builds



This release includes the following bugfixes:

configure.ac

+8 −33
Original line number Diff line number Diff line
@@ -370,29 +370,11 @@ AC_HELP_STRING([--disable-ldap],[Disable LDAP support]), 
       AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])

       AC_SUBST(CURL_DISABLE_LDAP, [1])

       ;;

  *)

       case $host in

         *-*-cygwin*)

           # Force no ldap. config/build process is broken for cygwin

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

           AC_SUBST(CURL_DISABLE_LDAP, [1])

           AC_MSG_RESULT(no)

           ;;

  *)

       AC_MSG_RESULT(yes)

       esac

       ;;

  esac ],[

       case $host in

         *-*-cygwin*)

           # Force no ldap. config/build process is broken for cygwin

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

           AC_SUBST(CURL_DISABLE_LDAP, [1])

           AC_MSG_RESULT(no)

           ;;

         *)

           AC_MSG_RESULT(yes)

       esac ]

       AC_MSG_RESULT(yes) ]

)

AC_MSG_CHECKING([whether to support ldaps])

AC_ARG_ENABLE(ldaps,
@@ -810,13 +792,11 @@ if test x$CURL_DISABLE_LDAP != x1 ; then 
  CURL_CHECK_HEADER_LDAP_SSL



  if test -z "$LDAPLIBNAME" ; then

    case $host in

      *-*-cygwin* | *-*-mingw* | *-*-pw32*)

        dnl Windows uses a single and unique OpenLDAP DLL name

    if test "$ac_cv_native_windows" = "yes"; then

      dnl Windows uses a single and unique LDAP library name

      LDAPLIBNAME="wldap32"

      LBERLIBNAME="no"

        ;;

    esac

    fi

  fi



  if test "$LDAPLIBNAME" ; then
@@ -862,12 +842,7 @@ if test x$CURL_DISABLE_LDAP != x1 ; then 


  if test "$LDAPLIBNAME" = "wldap32"; then

    curl_ldap_msg="enabled (winldap)"

    AC_DEFINE(CURL_LDAP_WIN, 1, [Use W$ LDAP implementation])

    case $host in

      *-*-cygwin* | *-*-pw32*)

        AC_DEFINE(CURL_LDAP_HYBRID, 1, [W$ LDAP with non-W$ compiler])

        ;;

    esac

    AC_DEFINE(CURL_LDAP_WIN, 1, [Use Windows LDAP implementation])

  else

    curl_ldap_msg="enabled (OpenLDAP)"

    if test "x$ac_cv_func_ldap_init_fd" = "xyes"; then

lib/config-symbian.h

+1 −4
Original line number Diff line number Diff line
@@ -48,10 +48,7 @@ 
/* to enable hidden symbols */

/*#define CURL_HIDDEN_SYMBOLS 1*/



/* W$ LDAP with non-W$ compiler */

/* #undef CURL_LDAP_HYBRID */



/* Use W$ LDAP implementation */

/* Use Windows LDAP implementation */

/* #undef CURL_LDAP_WIN */



/* when not building a shared library */