diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2019-05-13 21:42:35 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-05-15 00:32:42 +0100 |
| commit | e832d1ef74f260146cdab59cbac1d6969836663a (patch) | |
| tree | 2b06c75083bc17ab2cb274c7bae9feedf44fdfad /lib/urldata.h | |
| parent | 85bef18ca1afc356df3bb28e27ac74e4332affa1 (diff) | |
| download | curl-e832d1ef74f260146cdab59cbac1d6969836663a.tar.gz | |
http_negotiate: Move the Negotiate state out of the negotiatedata structure
Given that this member variable is not used by the SASL based protocols
there is no need to have it here.
Closes #3882
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index fe54651b1..053d190fe 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -361,11 +361,9 @@ struct ntlmdata { }; #endif +/* Struct used for Negotiate (SPNEGO) authentication */ #ifdef USE_SPNEGO struct negotiatedata { - /* When doing Negotiate (SPNEGO) auth, we first need to send a token - and then validate the received one. */ - curlnegotiate state; #ifdef HAVE_GSSAPI OM_uint32 status; gss_ctx_id_t context; @@ -985,6 +983,9 @@ struct connectdata { #endif #ifdef USE_SPNEGO + curlnegotiate http_negotiate_state; + curlnegotiate proxy_negotiate_state; + struct negotiatedata negotiate; /* state data for host Negotiate auth */ struct negotiatedata proxyneg; /* state data for proxy Negotiate auth */ #endif |