Commit 2cc571f9 authored by Steve Holme's avatar Steve Holme
Browse files

ldap: Renamed the CURL_LDAP_WIN definition to USE_WIN32_LDAP 

For consistency with other USE_WIN32_ defines as well as the
USE_OPENLDAP define.
parent 1cbc8fd3

CMakeLists.txt

+7 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -309,11 +309,11 @@ endif() 
if(NOT CURL_DISABLE_LDAP)



  if(WIN32)

    option(CURL_LDAP_WIN "Use Windows LDAP implementation" ON)

    if(CURL_LDAP_WIN)

    option(USE_WIN32_LDAP "Use Windows LDAP implementation" ON)

    if(USE_WIN32_LDAP)

      check_library_exists("wldap32" cldap_open "" HAVE_WLDAP32)

      if(NOT HAVE_WLDAP32)

        set(CURL_LDAP_WIN OFF)

        set(USE_WIN32_LDAP OFF)

      endif()

    endif()

  endif()
@@ -323,12 +323,12 @@ if(NOT CURL_DISABLE_LDAP) 
  set(CMAKE_LDAP_LIB "ldap" CACHE STRING "Name or full path to ldap library")

  set(CMAKE_LBER_LIB "lber" CACHE STRING "Name or full path to lber library")



  if(CMAKE_USE_OPENLDAP AND CURL_LDAP_WIN)

    message(FATAL_ERROR "Cannot use CURL_LDAP_WIN and CMAKE_USE_OPENLDAP at the same time")

  if(CMAKE_USE_OPENLDAP AND USE_WIN32_LDAP)

    message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CMAKE_USE_OPENLDAP at the same time")

  endif()

  

  # Now that we know, we're not using windows LDAP...

  if(NOT CURL_LDAP_WIN)

  if(NOT USE_WIN32_LDAP)

    # Check for LDAP

    set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})

    check_library_exists_concat(${CMAKE_LDAP_LIB} ldap_init HAVE_LIBLDAP)

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -1046,7 +1046,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 Windows LDAP implementation])

    AC_DEFINE(USE_WIN32_LDAP, 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

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -69,7 +69,7 @@ 
/* #undef CURL_EXTERN_SYMBOL */



/* Use Windows LDAP implementation */

/* #undef CURL_LDAP_WIN */

/* #undef USE_WIN32_LDAP */



/* your Entropy Gathering Daemon socket pathname */

/* #undef EGD_SOCKET */

lib/config-vxworks.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -75,7 +75,7 @@ 
/* #undef CURL_EXTERN_SYMBOL */



/* Use Windows LDAP implementation */

/* #undef CURL_LDAP_WIN */

/* #undef USE_WIN32_LDAP */



/* your Entropy Gathering Daemon socket pathname */

/* #undef EGD_SOCKET */

lib/config-win32.h

+6 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -678,25 +678,25 @@ Vista 
/* ---------------------------------------------------------------- */



#if defined(CURL_HAS_NOVELL_LDAPSDK) || defined(CURL_HAS_MOZILLA_LDAPSDK)

#undef CURL_LDAP_WIN

#undef USE_WIN32_LDAP

#define HAVE_LDAP_SSL_H 1

#define HAVE_LDAP_URL_PARSE 1

#elif defined(CURL_HAS_OPENLDAP_LDAPSDK)

#undef CURL_LDAP_WIN

#undef USE_WIN32_LDAP

#define HAVE_LDAP_URL_PARSE 1

#else

#undef HAVE_LDAP_URL_PARSE

#define CURL_LDAP_WIN 1

#define USE_WIN32_LDAP 1

#endif



#if defined(__WATCOMC__) && defined(CURL_LDAP_WIN)

#if defined(__WATCOMC__) && defined(USE_WIN32_LDAP)

#if __WATCOMC__ < 1280

#define WINBERAPI  __declspec(cdecl)

#define WINLDAPAPI __declspec(cdecl)

#endif

#endif



#if defined(__POCC__) && defined(CURL_LDAP_WIN)

#if defined(__POCC__) && defined(USE_WIN32_LDAP)

#  define CURL_DISABLE_LDAP 1

#endif