From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 18 Mar 2021 20:19:18 +0000 (+0100)
Subject: Fix typo in processbuffer() - tcpdns vs tlsdns
X-Git-Tag: v9.17.12~35^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=73c574e5535c31d284cc255804c3585047bbefec;p=thirdparty%2Fbind9.git

Fix typo in processbuffer() - tcpdns vs tlsdns

The processbuffer() would call isc__nm_tcpdns_processbuffer() instead of
isc__nm_tlsdns_processbuffer() for the isc_nm_tlsdnssocket type of
socket.
---

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index 7febbe940b9..ac973e01a56 100644
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -1857,7 +1857,7 @@ processbuffer(isc_nmsocket_t *sock) {
 	case isc_nm_tcpdnssocket:
 		return (isc__nm_tcpdns_processbuffer(sock));
 	case isc_nm_tlsdnssocket:
-		return (isc__nm_tcpdns_processbuffer(sock));
+		return (isc__nm_tlsdns_processbuffer(sock));
 	default:
 		INSIST(0);
 		ISC_UNREACHABLE();
diff --git a/lib/isc/netmgr/tlsdns.c b/lib/isc/netmgr/tlsdns.c
index cbff0f5860f..961dceaadd5 100644
--- a/lib/isc/netmgr/tlsdns.c
+++ b/lib/isc/netmgr/tlsdns.c
@@ -276,6 +276,7 @@ tlsdns_connect_cb(uv_connect_t *uvreq, int status) {
 	return;
 
 error:
+	sock->tls.pending_req = NULL;
 	isc__nm_failed_connect_cb(sock, req, result);
 }