Commit 01c172f5 authored by Yang Tse's avatar Yang Tse
Browse files

NTLM_WB: fix disabling of NTLM_WB when NTLM is disabled

parent e9cf4cb7

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ output_auth_headers(struct connectdata *conn, 
  }

  else

#endif

#ifdef NTLM_WB_ENABLED

#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

  if(authstatus->picked == CURLAUTH_NTLM_WB) {

    auth="NTLM_WB";

    result = Curl_output_ntlm_wb(conn, proxy);

lib/url.c

+10 −10
Original line number Diff line number Diff line
@@ -1380,10 +1380,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 


    /* switch off bits we can't support */

#ifndef USE_NTLM

    auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */

#endif

#ifndef NTLM_WB_ENABLED

    auth &= ~CURLAUTH_NTLM_WB;

    auth &= ~CURLAUTH_NTLM;    /* no NTLM support */

    auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */

#elif !defined(NTLM_WB_ENABLED)

    auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */

#endif

#ifndef USE_HTTP_NEGOTIATE

    auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or
@@ -1443,10 +1443,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
    }

    /* switch off bits we can't support */

#ifndef USE_NTLM

    auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */

#endif

#ifndef NTLM_WB_ENABLED

    auth &= ~CURLAUTH_NTLM_WB;

    auth &= ~CURLAUTH_NTLM;    /* no NTLM support */

    auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */

#elif !defined(NTLM_WB_ENABLED)

    auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */

#endif

#ifndef USE_HTTP_NEGOTIATE

    auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or
@@ -2531,7 +2531,7 @@ static void conn_free(struct connectdata *conn) 
  if(CURL_SOCKET_BAD != conn->sock[FIRSTSOCKET])

    Curl_closesocket(conn, conn->sock[FIRSTSOCKET]);



#ifdef NTLM_WB_ENABLED

#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

  Curl_ntlm_wb_cleanup(conn);

#endif
@@ -3524,7 +3524,7 @@ static struct connectdata *allocate_conn(struct SessionHandle *data) 


  conn->ip_version = data->set.ipver;



#ifdef NTLM_WB_ENABLED

#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

  conn->ntlm_auth_hlpr_socket = CURL_SOCKET_BAD;

  conn->ntlm_auth_hlpr_pid = 0;

  conn->challenge_header = NULL;

lib/urldata.h

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ struct connectdata { 
                               single requests! */

  struct ntlmdata proxyntlm; /* NTLM data for proxy */



#ifdef NTLM_WB_ENABLED

#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

  /* used for communication with Samba's winbind daemon helper ntlm_auth */

  curl_socket_t ntlm_auth_hlpr_socket;

  pid_t ntlm_auth_hlpr_pid;

lib/version.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static curl_version_info_data version_info = { 
#ifdef USE_NTLM

  | CURL_VERSION_NTLM

#endif

#ifdef NTLM_WB_ENABLED

#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

  | CURL_VERSION_NTLM_WB

#endif

#ifdef USE_WINDOWS_SSPI