Skip to content
Permalink
Browse files

url: Remove duplicate clean up of the winbind variables in conn_shutd…

…own()

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
  • Loading branch information...
captain-caveman2k committed May 8, 2019
1 parent 9f9ec7d commit be9fd703e0e919c7705c10fae6318afb2fda9f19
Showing with 0 additions and 6 deletions.
  1. +0 −6 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);

0 comments on commit be9fd70

Please sign in to comment.
You can’t perform that action at this time.