summaryrefslogtreecommitdiff
path: root/lib/curl_sasl.h
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-11-02 00:24:32 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-11-02 00:35:16 +0000
commitb6821dbb91a7433d7451c1ad4cbd49cc4b8a71a9 (patch)
treeaa55f2ea79191187bd7d93d80618eb802b63b43b /lib/curl_sasl.h
parentb04eef13182dd3d26bf095758d27b13556583fab (diff)
downloadgnurl-b6821dbb91a7433d7451c1ad4cbd49cc4b8a71a9.tar.gz
gnurl-b6821dbb91a7433d7451c1ad4cbd49cc4b8a71a9.tar.bz2
gnurl-b6821dbb91a7433d7451c1ad4cbd49cc4b8a71a9.zip
sasl: Fixed Kerberos V5 inclusion when CURL_DISABLE_CRYPTO_AUTH is used
Typically the USE_WINDOWS_SSPI definition would not be used when the CURL_DISABLE_CRYPTO_AUTH define is, however, it is still a valid build configuration and, as such, the SASL Kerberos V5 (GSSAPI) authentication data structures and functions would incorrectly be used when they shouldn't be. Introduced a new USE_KRB5 definition that takes into account the use of CURL_DISABLE_CRYPTO_AUTH like USE_SPNEGO and USE_NTLM do.
Diffstat (limited to 'lib/curl_sasl.h')
-rw-r--r--lib/curl_sasl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index e56fa1a5f..68ef5526c 100644
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -28,7 +28,7 @@ struct SessionHandle;
struct connectdata;
struct ntlmdata;
-#if defined(USE_WINDOWS_SSPI)
+#if defined(USE_KRB5)
struct kerberos5data;
#endif
@@ -123,7 +123,7 @@ CURLcode Curl_sasl_create_ntlm_type3_message(struct SessionHandle *data,
#endif /* USE_NTLM */
-#if defined(USE_WINDOWS_SSPI)
+#if defined(USE_KRB5)
/* This is used to generate a base64 encoded GSSAPI (Kerberos V5) user token
message */
CURLcode Curl_sasl_create_gssapi_user_message(struct SessionHandle *data,
@@ -142,7 +142,7 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data,
struct kerberos5data *krb5,
char **outptr,
size_t *outlen);
-#endif
+#endif /* USE_KRB5 */
/* This is used to generate a base64 encoded XOAUTH2 authentication message
containing the user name and bearer token */