From: Steve Holme <steve_holme@hotmail.com>
Date: Wed, 8 May 2019 10:36:08 +0000 (+0100)
Subject: url: Remove duplicate clean up of the winbind variables in conn_shutdown()
X-Git-Tag: curl-7_65_0~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be9fd703e0e919c7705c10fae6318afb2fda9f19;p=thirdparty%2Fcurl.git

url: Remove duplicate clean up of the winbind variables in conn_shutdown()

Given that Curl_disconnect() calls Curl_http_auth_cleanup_ntlm() prior
to calling conn_shutdown() and it in turn performs this, there is no
need to perform the same action in conn_shutdown().

Closes #3881
---

diff --git a/lib/url.c b/lib/url.c
index f50562876c..163037283d 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -109,7 +109,6 @@ bool curl_win32_idn_to_ascii(const char *in, char **out);
 #include "connect.h"
 #include "inet_ntop.h"
 #include "http_ntlm.h"
-#include "curl_ntlm_wb.h"
 #include "socks.h"
 #include "curl_rtmp.h"
 #include "gopher.h"
@@ -695,11 +694,6 @@ static void conn_shutdown(struct connectdata *conn)
   if(CURL_SOCKET_BAD != conn->tempsock[1])
     Curl_closesocket(conn, conn->tempsock[1]);
 
-#if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM) && \
-    defined(NTLM_WB_ENABLED)
-  Curl_http_auth_cleanup_ntlm_wb(conn);
-#endif
-
   /* unlink ourselves. this should be called last since other shutdown
      procedures need a valid conn->data and this may clear it. */
   Curl_conncache_remove_conn(conn->data, conn, TRUE);