diff --git a/CMakeLists.txt b/CMakeLists.txt index be0e5f8d7c..74361998c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -571,6 +571,8 @@ if(NOT CURL_DISABLE_LDAP) check_library_exists_concat("wldap32" cldap_open HAVE_WLDAP32) if(NOT HAVE_WLDAP32) set(USE_WIN32_LDAP OFF) + elseif(NOT CURL_DISABLE_LDAPS) + set(HAVE_LDAP_SSL ON) endif() endif() endif() diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 3b35ad9a66..754ac03481 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -109,7 +109,6 @@ problems may have been fixed or changed somewhat since this was written. 15.8 libcurl.pc uses absolute library paths 15.10 libpsl is not supported 15.11 ExternalProject_Add does not set CURL_CA_PATH - 15.12 cannot enable LDAPS on Windows 15.13 CMake build with MIT Kerberos does not work 16. Applications @@ -694,10 +693,6 @@ problems may have been fixed or changed somewhat since this was written. See https://github.com/curl/curl/issues/6313 -15.12 cannot enable LDAPS on Windows - - See https://github.com/curl/curl/issues/6284 - 15.13 CMake build with MIT Kerberos does not work Minimum CMake version was bumped in curl 7.71.0 (#5358) Since CMake 3.2 diff --git a/lib/ldap.c b/lib/ldap.c index 5e53f4c511..595e4b3b3b 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -140,6 +140,14 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp); #define ldap_err2string ldap_err2stringA #endif +#if defined(USE_WIN32_LDAP) && defined(_MSC_VER) && (_MSC_VER <= 1600) +/* Workaround for warning: + 'type cast' : conversion from 'int' to 'void *' of greater size */ +#undef LDAP_OPT_ON +#undef LDAP_OPT_OFF +#define LDAP_OPT_ON ((void *)(size_t)1) +#define LDAP_OPT_OFF ((void *)(size_t)0) +#endif static CURLcode ldap_do(struct Curl_easy *data, bool *done);