summaryrefslogtreecommitdiff
path: root/lib/version.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-11-09 12:46:00 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-11-09 12:54:34 +0000
commit520dc643699e563d63ef23a29ed5beaffda23ff8 (patch)
tree7d55bfcc5495264b4ec1ff826bbe17a7d792009c /lib/version.c
parent8145f92dcc59ae33566ff8db81d2da26bb56ae84 (diff)
downloadcurl-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/version.c')
-rw-r--r--lib/version.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/version.c b/lib/version.c
index 5da46665b..e34bb0464 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, 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
@@ -247,7 +247,8 @@ static curl_version_info_data version_info = {
#ifdef USE_NTLM
| CURL_VERSION_NTLM
#endif
-#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
+#if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM) && \
+ defined(NTLM_WB_ENABLED)
| CURL_VERSION_NTLM_WB
#endif
#ifdef USE_SPNEGO