summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-03-30 06:39:24 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-03-30 06:39:24 +0000
commit5e75c310ba0b74ad9dd075710d55bcb1fd58aadb (patch)
tree24131216496aee4b74fe912590deb4aacec0ea2a /lib
parent20cab07c291dc73cc28ea3a1b478c13393b71080 (diff)
downloadcurl-5e75c310ba0b74ad9dd075710d55bcb1fd58aadb.tar.gz
'authdone' was added to the sessionhandle and thus was removed from the
argument to the NTLM function(s)
Diffstat (limited to 'lib')
-rw-r--r--lib/http_ntlm.c11
-rw-r--r--lib/http_ntlm.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 005260858..d1f4e306c 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -277,8 +277,7 @@ static void mkhash(char *password,
/* this is for creating ntlm header output */
CURLcode Curl_output_ntlm(struct connectdata *conn,
- bool proxy,
- bool *ready)
+ bool proxy)
{
const char *domain=""; /* empty */
const char *host=""; /* empty */
@@ -300,7 +299,9 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
/* point to the correct struct with this */
struct ntlmdata *ntlm;
- *ready = FALSE;
+ curlassert(conn);
+ curlassert(conn->data);
+ conn->data->state.authdone = FALSE;
if(proxy) {
allocuserpwd = &conn->allocptr.proxyuserpwd;
@@ -562,7 +563,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
return CURLE_OUT_OF_MEMORY; /* FIX TODO */
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 */
if (proxy)
@@ -577,7 +578,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
free(*allocuserpwd);
*allocuserpwd=NULL;
}
- *ready = TRUE;
+ conn->data->state.authdone = TRUE;
break;
}
diff --git a/lib/http_ntlm.h b/lib/http_ntlm.h
index df7f49703..4386a1cbf 100644
--- a/lib/http_ntlm.h
+++ b/lib/http_ntlm.h
@@ -36,7 +36,7 @@ typedef enum {
CURLntlm Curl_input_ntlm(struct connectdata *conn, bool proxy, char *header);
/* 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);