romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 10:13:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

http_ntlm: Move the NTLM state out of the ntlmdata structure

Browse source 
Given that this member variable is not used by the SASL based protocols
there is no need to have it here.
This commit is contained in:
Steve Holme 2019-05-13 20:58:39 +01:00
parent 0c73adfad3
commit 85bef18ca1
No known key found for this signature in database
GPG key ID: 4059CB85CA7E8F19
6 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/url.c
View file

@ -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;