diff options
| author | Viktor Szakats <commit@vsz.me> | 2023-03-05 19:55:14 +0000 |
|---|---|---|
| committer | Viktor Szakats <commit@vsz.me> | 2023-03-05 19:55:14 +0000 |
| commit | 8cfc936f5c9d1fe9a99956a916f95e137476b27c (patch) | |
| tree | 9d969fa7d09956d50d948cf45c430bd0ee7d1bf0 /lib/ldap.c | |
| parent | 8d0fa3a70d14f0dd275e5b41442406b74142687a (diff) | |
| download | curl-8cfc936f5c9d1fe9a99956a916f95e137476b27c.tar.gz | |
cmake: fix enabling LDAPS on Windows
Before this patch, enabling LDAPS required a manual C flag:
https://github.com/curl/curl-for-win/blob/c1cfc31cfc04f24f7a4f946564d6f0e1b4d7dd36/curl-cmake.sh#L105
Fix this and enable LDAPS automatically when using `wldap32` (and
when not explicitly disabled). This matches autotools and `Makefile.mk`
behavior. Also remove issue from KNOWN_BUGS.
Add workaround for MSVS 2010 warning triggered by LDAPS now enabled
in more CI tests:
`ldap.c(360): warning C4306: 'type cast' : conversion from 'int' to 'void *' of greater size`
Ref: https://ci.appveyor.com/project/curlorg/curl/builds/46408284/job/v8mwl9yfbmoeqwlr#L312
Reported-by: JackBoosY on github
Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
Fixes #6284
Closes #10674
Diffstat (limited to 'lib/ldap.c')
| -rw-r--r-- | lib/ldap.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/ldap.c b/lib/ldap.c index 5e53f4c51..595e4b3b3 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); |