summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2019-05-08 11:36:08 +0100
committerSteve Holme <steve_holme@hotmail.com>2019-05-14 14:35:11 +0100
commitbe9fd703e0e919c7705c10fae6318afb2fda9f19 (patch)
tree52b61f2e458a139eab553f6e6eb47a10c4978bac
parent9f9ec7da570bf1468eafe611023627c9a2b0b5d2 (diff)
downloadcurl-be9fd703e0e919c7705c10fae6318afb2fda9f19.tar.gz
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
-rw-r--r--lib/url.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/url.c b/lib/url.c
index f50562876..163037283 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);