moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

NTLM_WB: fix disabling of NTLM_WB when NTLM is disabled

Browse Source
This commit is contained in:
Yang Tse 2011-09-22 00:24:02 +02:00
parent e9cf4cb791
commit 01c172f5e8
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/http.c
View File

@ -546,7 +546,7 @@ output_auth_headers(struct connectdata *conn,
} }
else else
#endif #endif
#ifdef NTLM_WB_ENABLED #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
if(authstatus->picked == CURLAUTH_NTLM_WB) { if(authstatus->picked == CURLAUTH_NTLM_WB) {
auth="NTLM_WB"; auth="NTLM_WB";
result = Curl_output_ntlm_wb(conn, proxy); result = Curl_output_ntlm_wb(conn, proxy);

20
lib/url.c
View File

@ -1380,10 +1380,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
/* switch off bits we can't support */ /* switch off bits we can't support */
#ifndef USE_NTLM #ifndef USE_NTLM
auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */ auth &= ~CURLAUTH_NTLM; /* no NTLM support */
#endif auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */
#ifndef NTLM_WB_ENABLED #elif !defined(NTLM_WB_ENABLED)
auth &= ~CURLAUTH_NTLM_WB; auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */
#endif #endif
#ifndef USE_HTTP_NEGOTIATE #ifndef USE_HTTP_NEGOTIATE
auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or 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 */ /* switch off bits we can't support */
#ifndef USE_NTLM #ifndef USE_NTLM
auth &= ~CURLAUTH_NTLM; /* no NTLM without SSL */ auth &= ~CURLAUTH_NTLM; /* no NTLM support */
#endif auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */
#ifndef NTLM_WB_ENABLED #elif !defined(NTLM_WB_ENABLED)
auth &= ~CURLAUTH_NTLM_WB; auth &= ~CURLAUTH_NTLM_WB; /* no NTLM_WB support */
#endif #endif
#ifndef USE_HTTP_NEGOTIATE #ifndef USE_HTTP_NEGOTIATE
auth &= ~CURLAUTH_GSSNEGOTIATE; /* no GSS-Negotiate without GSSAPI or 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]) if(CURL_SOCKET_BAD != conn->sock[FIRSTSOCKET])
Curl_closesocket(conn, 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); Curl_ntlm_wb_cleanup(conn);
#endif #endif
@ -3524,7 +3524,7 @@ static struct connectdata *allocate_conn(struct SessionHandle *data)
conn->ip_version = data->set.ipver; 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_socket = CURL_SOCKET_BAD;
conn->ntlm_auth_hlpr_pid = 0; conn->ntlm_auth_hlpr_pid = 0;
conn->challenge_header = NULL; conn->challenge_header = NULL;

2
lib/urldata.h
View File

@ -905,7 +905,7 @@ struct connectdata {
single requests! */ single requests! */
struct ntlmdata proxyntlm; /* NTLM data for proxy */ 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 */ /* used for communication with Samba's winbind daemon helper ntlm_auth */
curl_socket_t ntlm_auth_hlpr_socket; curl_socket_t ntlm_auth_hlpr_socket;
pid_t ntlm_auth_hlpr_pid; pid_t ntlm_auth_hlpr_pid;

2
lib/version.c
View File

@ -240,7 +240,7 @@ static curl_version_info_data version_info = {
#ifdef USE_NTLM #ifdef USE_NTLM
| CURL_VERSION_NTLM | CURL_VERSION_NTLM
#endif #endif
#ifdef NTLM_WB_ENABLED #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
| CURL_VERSION_NTLM_WB | CURL_VERSION_NTLM_WB
#endif #endif
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI