diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-11-23 11:51:31 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-11-23 11:51:31 +0000 |
| commit | cfff544d6798e8ef235b59a8d366d711159607be (patch) | |
| tree | 586b6af94b752416d6bc0e8e9373024e24e1b6db | |
| parent | 599d9642ca92a8f9b6feaef20844c1ef4f41dbcc (diff) | |
| download | curl-cfff544d6798e8ef235b59a8d366d711159607be.tar.gz | |
only enable NTLM if HTTP and NTLM is not disabled, and if NTLM is disabled
we define an empty macro for the ntlm cleanup function
| -rw-r--r-- | lib/http_ntlm.h | 3 | ||||
| -rw-r--r-- | lib/setup.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/http_ntlm.h b/lib/http_ntlm.h index c4e669ba1..a8de220a7 100644 --- a/lib/http_ntlm.h +++ b/lib/http_ntlm.h @@ -39,8 +39,7 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header); CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy); void Curl_ntlm_cleanup(struct connectdata *conn); -#if (!defined(USE_SSLEAY) && !defined(USE_WINDOWS_SSPI)) || \ - defined(CURL_DISABLE_HTTP) +#ifndef USE_NTLM #define Curl_ntlm_cleanup(x) #endif diff --git a/lib/setup.h b/lib/setup.h index ce0fc5075..bebe4e85a 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -301,9 +301,11 @@ typedef int curl_socket_t; #define USE_SSL /* Either OpenSSL || GnuTLS */ #endif +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM) #if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) #define USE_NTLM #endif +#endif #ifdef CURLDEBUG #define DEBUGF(x) x |