Unverified Commit 0c73adfa authored by Steve Holme's avatar Steve Holme
Browse files

url: Move the negotiate state type into a dedicated enum

parent be9fd703

lib/urldata.h

+9 −3
Original line number Original line Diff line number Diff line
@@ -303,6 +303,14 @@ typedef enum { 
  NTLMSTATE_LAST

  NTLMSTATE_LAST

} curlntlm;

} curlntlm;





typedef enum {

  GSS_AUTHNONE,

  GSS_AUTHRECV,

  GSS_AUTHSENT,

  GSS_AUTHDONE,

  GSS_AUTHSUCC

} curlnegotiate;



#if defined(CURL_DOES_CONVERSIONS) && defined(HAVE_ICONV)

#if defined(CURL_DOES_CONVERSIONS) && defined(HAVE_ICONV)

#include <iconv.h>

#include <iconv.h>

#endif

#endif
@@ -358,9 +366,7 @@ struct ntlmdata { 
struct negotiatedata {

struct negotiatedata {

  /* When doing Negotiate (SPNEGO) auth, we first need to send a token

  /* When doing Negotiate (SPNEGO) auth, we first need to send a token

     and then validate the received one. */

     and then validate the received one. */

  enum {

  curlnegotiate state;

    GSS_AUTHNONE, GSS_AUTHRECV, GSS_AUTHSENT, GSS_AUTHDONE, GSS_AUTHSUCC

  } state;

#ifdef HAVE_GSSAPI

#ifdef HAVE_GSSAPI

  OM_uint32 status;

  OM_uint32 status;

  gss_ctx_id_t context;

  gss_ctx_id_t context;