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

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 47664cbdf033435f5e7186e2aa2784a47adcc633..d0653d2fa7a739375503a6d655607a33e3456bb2 100644 (file)
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -181,11 +181,13 @@ ns_client_endrequest(ns_client_t *client) {
 
        CTRACE("endrequest");
 
-       LOCK(&client->manager->reclock);
-       if (ISC_LINK_LINKED(client, rlink)) {
-               ISC_LIST_UNLINK(client->manager->recursing, client, rlink);
+       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);
        }
-       UNLOCK(&client->manager->reclock);
 
        if (client->cleanup != NULL) {
                (client->cleanup)(client);