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
This commit is contained in:
@@ -39,8 +39,7 @@ CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header);
|
|||||||
CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy);
|
CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy);
|
||||||
|
|
||||||
void Curl_ntlm_cleanup(struct connectdata *conn);
|
void Curl_ntlm_cleanup(struct connectdata *conn);
|
||||||
#if (!defined(USE_SSLEAY) && !defined(USE_WINDOWS_SSPI)) || \
|
#ifndef USE_NTLM
|
||||||
defined(CURL_DISABLE_HTTP)
|
|
||||||
#define Curl_ntlm_cleanup(x)
|
#define Curl_ntlm_cleanup(x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -301,9 +301,11 @@ typedef int curl_socket_t;
|
|||||||
#define USE_SSL /* Either OpenSSL || GnuTLS */
|
#define USE_SSL /* Either OpenSSL || GnuTLS */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM)
|
||||||
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI)
|
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI)
|
||||||
#define USE_NTLM
|
#define USE_NTLM
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CURLDEBUG
|
#ifdef CURLDEBUG
|
||||||
#define DEBUGF(x) x
|
#define DEBUGF(x) x
|
||||||
|
|||||||
Reference in New Issue
Block a user