From: Mark Andrews <marka@isc.org>
Date: Thu, 15 Mar 2012 00:33:43 +0000 (+1100)
Subject: 3296.   [bug]           Named could die with a INSIST failure in
X-Git-Tag: v9.10.0a1~1277
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d8e73b1c76f2c7dcc641bfa7759c15df58c82c7e;p=thirdparty%2Fbind9.git

3296.   [bug]           Named could die with a INSIST failure in
                        client.c:exit_check. [RT #28346]
---

diff --git a/CHANGES b/CHANGES
index b7231456af1..6b0eb09f0d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3296.	[bug]		Named could die with a INSIST failure in
+			client.c:exit_check. [RT #28346]
+
 3295.	[bug]		Adjust isc_time_secondsastimet range check to be more
 			portable. [RT # 26542]
 
diff --git a/bin/named/client.c b/bin/named/client.c
index 2f4130c5ae6..ae13795f014 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -240,7 +240,7 @@ ns_client_recursing(ns_client_t *client) {
 	REQUIRE(client->state == NS_CLIENTSTATE_WORKING);
 
 	LOCK(&client->manager->reclock);
-	client->state = NS_CLIENTSTATE_RECURSING;
+	client->newstate = client->state = NS_CLIENTSTATE_RECURSING;
 	ISC_LIST_APPEND(client->manager->recursing, client, rlink);
 	UNLOCK(&client->manager->reclock);
 }