diff options
author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2020-08-03 10:33:17 +0200 |
---|---|---|
committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2020-08-29 10:08:32 +0200 |
commit | f504f18641ebedde8e8b3805472267efa9a9b528 (patch) | |
tree | 71c5071e5f6682b37a30f17fe1e702d7fbe0df36 /lib/smb.h | |
parent | 5cfb807bba0e767faed76681c0d414a346d4c43c (diff) | |
download | curl-f504f18641ebedde8e8b3805472267efa9a9b528.tar.gz |
ntlm: fix condition for curl_ntlm_core usage
`USE_WINDOWS_SSPI` without `USE_WIN32_CRYPTO` but with any other DES
backend is fine, but was excluded before.
This also fixes test 1013 as the condition for SMB support in
configure.ac didn't match the condition in the source code. Now it
does.
Fixes https://github.com/curl/curl/issues/1262
Closes https://github.com/curl/curl/pull/5771
Diffstat (limited to 'lib/smb.h')
-rw-r--r-- | lib/smb.h | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -243,16 +243,13 @@ struct smb_tree_disconnect { #endif /* BUILDING_CURL_SMB_C */ -#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ +#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \ (CURL_SIZEOF_CURL_OFF_T > 4) -#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) - extern const struct Curl_handler Curl_handler_smb; extern const struct Curl_handler Curl_handler_smbs; -#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */ - -#endif /* CURL_DISABLE_SMB && USE_NTLM && CURL_SIZEOF_CURL_OFF_T > 4 */ +#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && + CURL_SIZEOF_CURL_OFF_T > 4 */ #endif /* HEADER_CURL_SMB_H */ |