diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-11-09 12:46:00 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-11-09 12:54:34 +0000 |
| commit | 520dc643699e563d63ef23a29ed5beaffda23ff8 (patch) | |
| tree | 7d55bfcc5495264b4ec1ff826bbe17a7d792009c /lib/curl_ntlm_wb.h | |
| parent | 8145f92dcc59ae33566ff8db81d2da26bb56ae84 (diff) | |
| download | curl-520dc643699e563d63ef23a29ed5beaffda23ff8.tar.gz | |
build: Fixed no NTLM support for email when CURL_DISABLE_HTTP is defined
USE_NTLM would only be defined if: HTTP support was enabled, NTLM and
cryptography weren't disabled, and either a supporting cryptography
library or Windows SSPI was being compiled against.
This means it was not possible to build libcurl without HTTP support
and use NTLM for other protocols such as IMAP, POP3 and SMTP. Rather
than introduce a new SASL pre-processor definition, removed the HTTP
prerequisite just like USE_SPNEGO and USE_KRB5.
Note: Winbind support still needs to be dependent on CURL_DISABLE_HTTP
as it is only available to HTTP at present.
This bug dates back to August 2011 when I started to add support for
NTLM to SMTP.
Diffstat (limited to 'lib/curl_ntlm_wb.h')
| -rw-r--r-- | lib/curl_ntlm_wb.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/curl_ntlm_wb.h b/lib/curl_ntlm_wb.h index db6bc16b7..828bb5767 100644 --- a/lib/curl_ntlm_wb.h +++ b/lib/curl_ntlm_wb.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -24,7 +24,8 @@ #include "curl_setup.h" -#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED) +#if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM) && \ + defined(NTLM_WB_ENABLED) /* this is for creating ntlm header output by delegating challenge/response to Samba's winbind daemon helper ntlm_auth */ @@ -32,6 +33,6 @@ CURLcode Curl_output_ntlm_wb(struct connectdata *conn, bool proxy); void Curl_ntlm_wb_cleanup(struct connectdata *conn); -#endif /* USE_NTLM && NTLM_WB_ENABLED */ +#endif /* !CURL_DISABLE_HTTP && USE_NTLM && NTLM_WB_ENABLED */ #endif /* HEADER_CURL_NTLM_WB_H */ |