From: Witold Kręcicki <wpk@isc.org>
Date: Fri, 7 Feb 2020 10:00:58 +0000 (+0100)
Subject: Revert "Don't check if the client is on recursing list (requires locking) if it's... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fc5214464f071da320cd5c35b62a6619ace7d2e;p=thirdparty%2Fbind9.git

Revert "Don't check if the client is on recursing list (requires locking) if it's not RECURSING"

This reverts commit 41cec3a619bd604842a1de4d6953ff2a90b239f4.
---

diff --git a/lib/ns/client.c b/lib/ns/client.c
index e20347a7258..ef486430173 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -183,13 +183,11 @@ ns_client_endrequest(ns_client_t *client) {
 
 	CTRACE("endrequest");
 
-	if (client->state == NS_CLIENTSTATE_RECURSING) {
-		LOCK(&client->manager->reclock);
-		if (ISC_LINK_LINKED(client, rlink)) {
-			ISC_LIST_UNLINK(client->manager->recursing, client, rlink);
-		}
-		UNLOCK(&client->manager->reclock);
+	LOCK(&client->manager->reclock);
+	if (ISC_LINK_LINKED(client, rlink)) {
+		ISC_LIST_UNLINK(client->manager->recursing, client, rlink);
 	}
+	UNLOCK(&client->manager->reclock);
 
 	if (client->cleanup != NULL) {
 		(client->cleanup)(client);