moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

ldap: Renamed the CURL_LDAP_WIN definition to USE_WIN32_LDAP

Browse Source 
For consistency with other USE_WIN32_ defines as well as the
USE_OPENLDAP define.
This commit is contained in:
Steve Holme 2015-01-18 20:25:37 +00:00
parent 1cbc8fd3d1
commit 2cc571f9e3
10 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -309,11 +309,11 @@ endif()
if(NOT CURL_DISABLE_LDAP) if(NOT CURL_DISABLE_LDAP)
if(WIN32) if(WIN32)
option(CURL_LDAP_WIN "Use Windows LDAP implementation" ON) option(USE_WIN32_LDAP "Use Windows LDAP implementation" ON)
if(CURL_LDAP_WIN) if(USE_WIN32_LDAP)
check_library_exists("wldap32" cldap_open "" HAVE_WLDAP32) check_library_exists("wldap32" cldap_open "" HAVE_WLDAP32)
if(NOT HAVE_WLDAP32) if(NOT HAVE_WLDAP32)
set(CURL_LDAP_WIN OFF) set(USE_WIN32_LDAP OFF)
endif() endif()
endif() 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_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") set(CMAKE_LBER_LIB "lber" CACHE STRING "Name or full path to lber library")
if(CMAKE_USE_OPENLDAP AND CURL_LDAP_WIN) if(CMAKE_USE_OPENLDAP AND USE_WIN32_LDAP)
message(FATAL_ERROR "Cannot use CURL_LDAP_WIN and CMAKE_USE_OPENLDAP at the same time") message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CMAKE_USE_OPENLDAP at the same time")
endif() endif()
# Now that we know, we're not using windows LDAP... # Now that we know, we're not using windows LDAP...
if(NOT CURL_LDAP_WIN) if(NOT USE_WIN32_LDAP)
# Check for LDAP # Check for LDAP
set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
check_library_exists_concat(${CMAKE_LDAP_LIB} ldap_init HAVE_LIBLDAP) check_library_exists_concat(${CMAKE_LDAP_LIB} ldap_init HAVE_LIBLDAP)

4
configure.ac
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # 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 if test "$LDAPLIBNAME" = "wldap32"; then
curl_ldap_msg="enabled (winldap)" 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 else
curl_ldap_msg="enabled (OpenLDAP)" curl_ldap_msg="enabled (OpenLDAP)"
if test "x$ac_cv_func_ldap_init_fd" = "xyes"; then if test "x$ac_cv_func_ldap_init_fd" = "xyes"; then

4
lib/config-symbian.h
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -69,7 +69,7 @@
/* #undef CURL_EXTERN_SYMBOL */ /* #undef CURL_EXTERN_SYMBOL */
/* Use Windows LDAP implementation */ /* Use Windows LDAP implementation */
/* #undef CURL_LDAP_WIN */ /* #undef USE_WIN32_LDAP */
/* your Entropy Gathering Daemon socket pathname */ /* your Entropy Gathering Daemon socket pathname */
/* #undef EGD_SOCKET */ /* #undef EGD_SOCKET */

4
lib/config-vxworks.h
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -75,7 +75,7 @@
/* #undef CURL_EXTERN_SYMBOL */ /* #undef CURL_EXTERN_SYMBOL */
/* Use Windows LDAP implementation */ /* Use Windows LDAP implementation */
/* #undef CURL_LDAP_WIN */ /* #undef USE_WIN32_LDAP */
/* your Entropy Gathering Daemon socket pathname */ /* your Entropy Gathering Daemon socket pathname */
/* #undef EGD_SOCKET */ /* #undef EGD_SOCKET */

12
lib/config-win32.h
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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) #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_SSL_H 1
#define HAVE_LDAP_URL_PARSE 1 #define HAVE_LDAP_URL_PARSE 1
#elif defined(CURL_HAS_OPENLDAP_LDAPSDK) #elif defined(CURL_HAS_OPENLDAP_LDAPSDK)
#undef CURL_LDAP_WIN #undef USE_WIN32_LDAP
#define HAVE_LDAP_URL_PARSE 1 #define HAVE_LDAP_URL_PARSE 1
#else #else
#undef HAVE_LDAP_URL_PARSE #undef HAVE_LDAP_URL_PARSE
#define CURL_LDAP_WIN 1 #define USE_WIN32_LDAP 1
#endif #endif
#if defined(__WATCOMC__) && defined(CURL_LDAP_WIN) #if defined(__WATCOMC__) && defined(USE_WIN32_LDAP)
#if __WATCOMC__ < 1280 #if __WATCOMC__ < 1280
#define WINBERAPI __declspec(cdecl) #define WINBERAPI __declspec(cdecl)
#define WINLDAPAPI __declspec(cdecl) #define WINLDAPAPI __declspec(cdecl)
#endif #endif
#endif #endif
#if defined(__POCC__) && defined(CURL_LDAP_WIN) #if defined(__POCC__) && defined(USE_WIN32_LDAP)
# define CURL_DISABLE_LDAP 1 # define CURL_DISABLE_LDAP 1
#endif #endif

4
lib/config-win32ce.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -409,7 +409,7 @@
/* LDAP SUPPORT */ /* LDAP SUPPORT */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
#define CURL_LDAP_WIN 1 #define USE_WIN32_LDAP 1
#undef HAVE_LDAP_URL_PARSE #undef HAVE_LDAP_URL_PARSE
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */

2
lib/curl_config.h.cmake
View File

@ -53,7 +53,7 @@
#endif #endif
/* Use Windows LDAP implementation */ /* Use Windows LDAP implementation */
#cmakedefine CURL_LDAP_WIN 1 #cmakedefine USE_WIN32_LDAP 1
/* when not building a shared library */ /* when not building a shared library */
#cmakedefine CURL_STATICLIB 1 #cmakedefine CURL_STATICLIB 1

4
lib/curl_multibyte.c
View File

@ -23,7 +23,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \ #if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
defined(CURL_LDAP_WIN)) && defined(UNICODE)) defined(USE_WIN32_LDAP)) && defined(UNICODE))
/* /*
* MultiByte conversions using Windows kernel32 library. * MultiByte conversions using Windows kernel32 library.
@ -80,4 +80,4 @@ char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w)
return str_utf8; return str_utf8;
} }
#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI || CURL_LDAP_WIN) && UNICODE) */ #endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI || USE_WIN32_LDAP) && UNICODE) */

8
lib/curl_multibyte.h
View File

@ -24,7 +24,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \ #if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
defined(CURL_LDAP_WIN)) && defined(UNICODE)) defined(USE_WIN32_LDAP)) && defined(UNICODE))
/* /*
* MultiByte conversions using Windows kernel32 library. * MultiByte conversions using Windows kernel32 library.
@ -33,11 +33,11 @@
wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8); wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8);
char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w); char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w);
#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI || CURL_LDAP_WIN) && UNICODE) */ #endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI || USE_WIN32_LDAP) && UNICODE) */
#if defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI) || \ #if defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI) || \
defined(CURL_LDAP_WIN) defined(USE_WIN32_LDAP)
/* /*
* Macros Curl_convert_UTF8_to_tchar(), Curl_convert_tchar_to_UTF8() * Macros Curl_convert_UTF8_to_tchar(), Curl_convert_tchar_to_UTF8()
@ -87,6 +87,6 @@ typedef union {
#endif /* UNICODE */ #endif /* UNICODE */
#endif /* USE_WIN32_IDN || USE_WINDOWS_SSPI || CURL_LDAP_WIN */ #endif /* USE_WIN32_IDN || USE_WINDOWS_SSPI || USE_WIN32_LDAP */
#endif /* HEADER_CURL_MULTIBYTE_H */ #endif /* HEADER_CURL_MULTIBYTE_H */

54
lib/ldap.c
View File

@ -35,7 +35,7 @@
* OpenLDAP library versions, USE_OPENLDAP shall not be defined. * OpenLDAP library versions, USE_OPENLDAP shall not be defined.
*/ */
#ifdef CURL_LDAP_WIN /* Use Windows LDAP implementation. */ #ifdef USE_WIN32_LDAP /* Use Windows LDAP implementation. */
# include <winldap.h> # include <winldap.h>
# ifndef LDAP_VENDOR_NAME # ifndef LDAP_VENDOR_NAME
# error Your Platform SDK is NOT sufficient for LDAP support! \ # error Your Platform SDK is NOT sufficient for LDAP support! \
@ -81,7 +81,7 @@
typedef struct { typedef struct {
char *lud_host; char *lud_host;
int lud_port; int lud_port;
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
TCHAR *lud_dn; TCHAR *lud_dn;
TCHAR **lud_attrs; TCHAR **lud_attrs;
#else #else
@ -89,7 +89,7 @@ typedef struct {
char **lud_attrs; char **lud_attrs;
#endif #endif
int lud_scope; int lud_scope;
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
TCHAR *lud_filter; TCHAR *lud_filter;
#else #else
char *lud_filter; char *lud_filter;
@ -194,7 +194,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
#ifdef LDAP_OPT_NETWORK_TIMEOUT #ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval ldap_timeout = {10,0}; /* 10 sec connection/search timeout */ struct timeval ldap_timeout = {10,0}; /* 10 sec connection/search timeout */
#endif #endif
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
TCHAR *host = NULL; TCHAR *host = NULL;
TCHAR *user = NULL; TCHAR *user = NULL;
TCHAR *passwd = NULL; TCHAR *passwd = NULL;
@ -226,7 +226,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
infof(data, "LDAP local: trying to establish %s connection\n", infof(data, "LDAP local: trying to establish %s connection\n",
ldap_ssl ? "encrypted" : "cleartext"); ldap_ssl ? "encrypted" : "cleartext");
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
host = Curl_convert_UTF8_to_tchar(conn->host.name); host = Curl_convert_UTF8_to_tchar(conn->host.name);
if(!host) { if(!host) {
result = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
@ -259,7 +259,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(ldap_ssl) { if(ldap_ssl) {
#ifdef HAVE_LDAP_SSL #ifdef HAVE_LDAP_SSL
#ifdef CURL_LDAP_WIN #ifdef USE_WIN32_LDAP
/* Win32 LDAP SDK doesn't support insecure mode without CA! */ /* Win32 LDAP SDK doesn't support insecure mode without CA! */
server = ldap_sslinit(host, (int)conn->port, 1); server = ldap_sslinit(host, (int)conn->port, 1);
ldap_set_option(server, LDAP_OPT_SSL, LDAP_OPT_ON); ldap_set_option(server, LDAP_OPT_SSL, LDAP_OPT_ON);
@ -392,7 +392,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
goto quit; goto quit;
} }
} }
#ifdef CURL_LDAP_WIN #ifdef USE_WIN32_LDAP
ldap_set_option(server, LDAP_OPT_PROTOCOL_VERSION, &ldap_proto); ldap_set_option(server, LDAP_OPT_PROTOCOL_VERSION, &ldap_proto);
#endif #endif
@ -421,7 +421,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
entryIterator; entryIterator;
entryIterator = ldap_next_entry(server, entryIterator), num++) { entryIterator = ldap_next_entry(server, entryIterator), num++) {
BerElement *ber = NULL; BerElement *ber = NULL;
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
TCHAR *attribute; TCHAR *attribute;
#else #else
char *attribute; /*! suspicious that this isn't 'const' */ char *attribute; /*! suspicious that this isn't 'const' */
@ -432,7 +432,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
{ {
char *name; char *name;
size_t name_len; size_t name_len;
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
TCHAR *dn = ldap_get_dn(server, entryIterator); TCHAR *dn = ldap_get_dn(server, entryIterator);
name = Curl_convert_tchar_to_UTF8(dn); name = Curl_convert_tchar_to_UTF8(dn);
if(!name) { if(!name) {
@ -449,7 +449,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"DN: ", 4); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"DN: ", 4);
if(result) { if(result) {
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(name); Curl_unicodefree(name);
#endif #endif
ldap_memfree(dn); ldap_memfree(dn);
@ -460,7 +460,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *) name, result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *) name,
name_len); name_len);
if(result) { if(result) {
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(name); Curl_unicodefree(name);
#endif #endif
ldap_memfree(dn); ldap_memfree(dn);
@ -470,7 +470,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1);
if(result) { if(result) {
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(name); Curl_unicodefree(name);
#endif #endif
ldap_memfree(dn); ldap_memfree(dn);
@ -480,7 +480,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
dlsize += name_len + 5; dlsize += name_len + 5;
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(name); Curl_unicodefree(name);
#endif #endif
ldap_memfree(dn); ldap_memfree(dn);
@ -492,7 +492,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
attribute = ldap_next_attribute(server, entryIterator, ber)) { attribute = ldap_next_attribute(server, entryIterator, ber)) {
BerValue **vals; BerValue **vals;
size_t attr_len; size_t attr_len;
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
char *attr = Curl_convert_tchar_to_UTF8(attribute); char *attr = Curl_convert_tchar_to_UTF8(attribute);
if(!attr) { if(!attr) {
if(ber) if(ber)
@ -513,7 +513,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\t", 1); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\t", 1);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -527,7 +527,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
(char *) attr, attr_len); (char *) attr, attr_len);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -540,7 +540,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)": ", 2); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)": ", 2);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -562,7 +562,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
&val_b64_sz); &val_b64_sz);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -578,7 +578,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
free(val_b64); free(val_b64);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -596,7 +596,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
vals[i]->bv_len); vals[i]->bv_len);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -612,7 +612,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1);
if(result) { if(result) {
ldap_value_free_len(vals); ldap_value_free_len(vals);
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -630,7 +630,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
} }
/* Free the attribute as we are done with it */ /* Free the attribute as we are done with it */
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(attr); Curl_unicodefree(attr);
#endif #endif
ldap_memfree(attribute); ldap_memfree(attribute);
@ -662,7 +662,7 @@ quit:
ldapssl_client_deinit(); ldapssl_client_deinit();
#endif /* HAVE_LDAP_SSL && CURL_HAS_NOVELL_LDAPSDK */ #endif /* HAVE_LDAP_SSL && CURL_HAS_NOVELL_LDAPSDK */
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
Curl_unicodefree(passwd); Curl_unicodefree(passwd);
Curl_unicodefree(user); Curl_unicodefree(user);
Curl_unicodefree(host); Curl_unicodefree(host);
@ -802,7 +802,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
goto quit; goto quit;
} }
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
/* Convert the unescaped string to a tchar */ /* Convert the unescaped string to a tchar */
ludp->lud_dn = Curl_convert_UTF8_to_tchar(unescaped); ludp->lud_dn = Curl_convert_UTF8_to_tchar(unescaped);
@ -840,7 +840,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
} }
/* Allocate our array (+1 for the NULL entry) */ /* Allocate our array (+1 for the NULL entry) */
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
ludp->lud_attrs = calloc(count + 1, sizeof(TCHAR *)); ludp->lud_attrs = calloc(count + 1, sizeof(TCHAR *));
#else #else
ludp->lud_attrs = calloc(count + 1, sizeof(char *)); ludp->lud_attrs = calloc(count + 1, sizeof(char *));
@ -868,7 +868,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
goto quit; goto quit;
} }
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
/* Convert the unescaped string to a tchar */ /* Convert the unescaped string to a tchar */
ludp->lud_attrs[i] = Curl_convert_UTF8_to_tchar(unescaped); ludp->lud_attrs[i] = Curl_convert_UTF8_to_tchar(unescaped);
@ -934,7 +934,7 @@ static int _ldap_url_parse2 (const struct connectdata *conn, LDAPURLDesc *ludp)
goto quit; goto quit;
} }
#if defined(CURL_LDAP_WIN) #if defined(USE_WIN32_LDAP)
/* Convert the unescaped string to a tchar */ /* Convert the unescaped string to a tchar */
ludp->lud_filter = Curl_convert_UTF8_to_tchar(unescaped); ludp->lud_filter = Curl_convert_UTF8_to_tchar(unescaped);