Commit 5e75c310 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

'authdone' was added to the sessionhandle and thus was removed from the 

argument to the NTLM function(s)
parent 20cab07c

lib/http_ntlm.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -277,8 +277,7 @@ static void mkhash(char *password, 




/* this is for creating ntlm header output */

/* this is for creating ntlm header output */

CURLcode Curl_output_ntlm(struct connectdata *conn,

CURLcode Curl_output_ntlm(struct connectdata *conn,

                          bool proxy,

                          bool proxy)

                          bool *ready)

{

{

  const char *domain=""; /* empty */

  const char *domain=""; /* empty */

  const char *host=""; /* empty */

  const char *host=""; /* empty */
@@ -300,7 +299,9 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, 
  /* point to the correct struct with this */

  /* point to the correct struct with this */

  struct ntlmdata *ntlm;

  struct ntlmdata *ntlm;





  *ready = FALSE;

  curlassert(conn);

  curlassert(conn->data);

  conn->data->state.authdone = FALSE;





  if(proxy) {

  if(proxy) {

    allocuserpwd = &conn->allocptr.proxyuserpwd;

    allocuserpwd = &conn->allocptr.proxyuserpwd;
@@ -562,7 +563,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, 
      return CURLE_OUT_OF_MEMORY; /* FIX TODO */

      return CURLE_OUT_OF_MEMORY; /* FIX TODO */





    ntlm->state = NTLMSTATE_TYPE3; /* we sent a type-3 */

    ntlm->state = NTLMSTATE_TYPE3; /* we sent a type-3 */

    *ready = TRUE;

    conn->data->state.authdone = TRUE;





    /* Switch to web authentication after proxy authentication is done */

    /* Switch to web authentication after proxy authentication is done */

    if (proxy)

    if (proxy)
@@ -577,7 +578,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, 
      free(*allocuserpwd);

      free(*allocuserpwd);

      *allocuserpwd=NULL;

      *allocuserpwd=NULL;

    }

    }

    *ready = TRUE;

    conn->data->state.authdone = TRUE;

    break;

    break;

  }

  }

lib/http_ntlm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ typedef enum { 
CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header);

CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header);





/* this is for creating ntlm header output */

/* this is for creating ntlm header output */

CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy, bool *ready);

CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy);





void Curl_ntlm_cleanup(struct SessionHandle *data);

void Curl_ntlm_cleanup(struct SessionHandle *data);