summaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2019-05-13 20:58:39 +0100
committerSteve Holme <steve_holme@hotmail.com>2019-05-15 00:31:45 +0100
commit85bef18ca1afc356df3bb28e27ac74e4332affa1 (patch)
tree7d16e10766c905e0f5a67bede4292d936ab9cf4d /lib/url.c
parent0c73adfad3ef9ea2fe2a0ebf7eb0a78b5abb877c (diff)
downloadcurl-85bef18ca1afc356df3bb28e27ac74e4332affa1.tar.gz
http_ntlm: Move the NTLM state out of the ntlmdata structure
Given that this member variable is not used by the SASL based protocols there is no need to have it here.
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/url.c b/lib/url.c
index 163037283..c2691e6c9 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1278,7 +1278,7 @@ ConnectionExists(struct Curl_easy *data,
strcmp(needle->passwd, check->passwd))
continue;
}
- else if(check->ntlm.state != NTLMSTATE_NONE) {
+ else if(check->http_ntlm_state != NTLMSTATE_NONE) {
/* Connection is using NTLM auth but we don't want NTLM */
continue;
}
@@ -1294,7 +1294,7 @@ ConnectionExists(struct Curl_easy *data,
strcmp(needle->http_proxy.passwd, check->http_proxy.passwd))
continue;
}
- else if(check->proxyntlm.state != NTLMSTATE_NONE) {
+ else if(check->proxy_ntlm_state != NTLMSTATE_NONE) {
/* Proxy connection is using NTLM auth but we don't want NTLM */
continue;
}
@@ -1304,9 +1304,9 @@ ConnectionExists(struct Curl_easy *data,
chosen = check;
if((wantNTLMhttp &&
- (check->ntlm.state != NTLMSTATE_NONE)) ||
+ (check->http_ntlm_state != NTLMSTATE_NONE)) ||
(wantProxyNTLMhttp &&
- (check->proxyntlm.state != NTLMSTATE_NONE))) {
+ (check->proxy_ntlm_state != NTLMSTATE_NONE))) {
/* We must use this connection, no other */
*force_reuse = TRUE;
break;