[PATCH 2/2] move internal auth state in http_auth_state.

Nikos Mavrogiannopoulos n.mavrogiannopoulos at gmail.com
Fri Feb 20 08:12:38 PST 2015


On Fri, Feb 20, 2015 at 4:28 PM, David Woodhouse <dwmw2 at infradead.org> wrote:
> On Fri, 2015-02-20 at 15:59 +0100, Nikos Mavrogiannopoulos wrote:
>> --- a/openconnect-internal.h
>> +++ b/openconnect-internal.h
>> @@ -216,6 +216,19 @@ struct oc_text_buf {
>>  struct http_auth_state {
>>         int state;
>>         char *challenge;
>> +#ifdef HAVE_GSSAPI
>> +       gss_name_t gss_target_name;
>> +       gss_ctx_id_t gss_context;
>> +#endif
>> +#ifdef _WIN32
>> +       CredHandle ntlm_sspi_cred;
>> +       CtxtHandle ntlm_sspi_ctx;
>> +       CredHandle sspi_cred[2];
>> +       CtxtHandle sspi_ctx[2];
>> +       SEC_WCHAR *sspi_target_name[2];

I may have forgotten to remove the [2] here. The windows part is untested.

> We could even have the GSSAPI stuff and ntlm_helper_fd in a union, in
> fact. They don't need to take up *separate* space.

Correct bug given that the ntlm thing is just an int, the added
complexity may not pay off.

regards,
Nikos



More information about the openconnect-devel mailing list