NTLM single-sign on adjustments (VII)

Initialize variables when connectdata object is created.

diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index dc90604..ba0a4d7 100644 (file)
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -946,11 +946,6 @@ CURLcode Curl_output_ntlm_sso(struct connectdata *conn,
      * If NTLM single-sign-on fails, go back to original request
      * handling process.
      */
-    /* Clean data before using them */
-    conn->ntlm_auth_hlpr_socket = CURL_SOCKET_BAD;
-    conn->ntlm_auth_hlpr_pid = 0;
-    conn->challenge_header = NULL;
-    conn->response_header = NULL;
     /* Create communication with ntlm_auth */
     res = sso_ntlm_initiate(conn, userp);
     if(res)

diff --git a/lib/url.c b/lib/url.c
index aa1e6f8..bffa234 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -3515,6 +3515,13 @@ static struct connectdata *allocate_conn(struct SessionHandle *data)
 
   conn->ip_version = data->set.ipver;
 
+#ifdef USE_NTLM_SSO
+  conn->ntlm_auth_hlpr_socket = CURL_SOCKET_BAD;
+  conn->ntlm_auth_hlpr_pid = 0;
+  conn->challenge_header = NULL;
+  conn->response_header = NULL;
+#endif
+
   if(data->multi && Curl_multi_canPipeline(data->multi) &&
       !conn->master_buffer) {
     /* Allocate master_buffer to be used for pipelining */