summaryrefslogtreecommitdiff
path: root/lib/curl_sasl.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-11-09 15:12:56 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-11-09 15:12:35 +0000
commit2fbf23875f992aba93d85a7b77802eeecb8503cb (patch)
treef999b20f6f3f05d63ba3a7424e0d593c2041a176 /lib/curl_sasl.c
parent48d19acb7cebb13f9222789ff90fd1dccef3c3c7 (diff)
downloadcurl-2fbf23875f992aba93d85a7b77802eeecb8503cb.tar.gz
ntlm: Added separate SSPI based functions
In preparation for moving the NTLM message code into the SASL module, and separating the native code from the SSPI code, added functions that simply call the functions in curl_ntlm_msg.c.
Diffstat (limited to 'lib/curl_sasl.c')
-rw-r--r--lib/curl_sasl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 75af97f58..44efd9149 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -1097,7 +1097,7 @@ void Curl_sasl_digest_cleanup(struct digestdata *digest)
#endif /* CURL_DISABLE_CRYPTO_AUTH */
-#ifdef USE_NTLM
+#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
/*
* Curl_sasl_create_ntlm_type1_message()
*
@@ -1183,7 +1183,6 @@ CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data,
outlen);
}
-#if !defined(USE_WINDOWS_SSPI)
/*
* Curl_sasl_ntlm_cleanup()
*
@@ -1202,9 +1201,7 @@ void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm)
/* Reset any variables */
ntlm->target_info_len = 0;
}
-#endif /* !USE_WINDOWS_SSPI */
-
-#endif /* USE_NTLM */
+#endif /* USE_NTLM && !USE_WINDOWS_SSPI*/
/*
* Curl_sasl_create_xoauth2_message()