From 16b9ee24b96a1c1d21d809e88238091c4afa25c9 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 7 Jun 2005 01:52:51 +0000
Subject: [PATCH] 1857.   [bug]           named could trigger a INSIST() if
 reconfigured /                         reloaded too fast.  [RT #14673]

---
 CHANGES              | 3 ++-
 bin/named/server.c   | 8 ++++++--
 doc/private/branches | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index ca6558c455..42559c7ea4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,7 +39,8 @@
 1858.	[bug]		The flush-zones-on-shutdown option wasn't being
 			parsed. [RT #14686]
 
-1857.	[placeholder]	rt14673
+1857.	[bug]		named could trigger a INSIST() if reconfigured /
+			reloaded too fast.  [RT #14673]
 
 1856.	[doc]		Switch Docbook toolchain from DSSSL to XSL.
 			[RT #11398]
diff --git a/bin/named/server.c b/bin/named/server.c
index 4fa3f19dc6..5273837ec9 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.443 2005/06/07 00:27:32 marka Exp $ */
+/* $Id: server.c,v 1.444 2005/06/07 01:52:51 marka Exp $ */
 
 /*! \file */
 
@@ -2008,9 +2008,13 @@ adjust_interfaces(ns_server_t *server, isc_mem_t *mctx) {
 		 * At this point the zone list may contain a stale zone
 		 * just removed from the configuration.  To see the validity,
 		 * check if the corresponding view is in our current view list.
+		 * There may also be old zones that are still in the process
+		 * of shutting down and have detached from their old view
+		 * (zoneview == NULL).
 		 */
 		zoneview = dns_zone_getview(zone);
-		INSIST(zoneview != NULL);
+		if (zoneview == NULL)
+			continue;
 		for (view = ISC_LIST_HEAD(server->viewlist);
 		     view != NULL && view != zoneview;
 		     view = ISC_LIST_NEXT(view, link))
diff --git a/doc/private/branches b/doc/private/branches
index b26bb2ab43..4a26c8bea8 100644
--- a/doc/private/branches
+++ b/doc/private/branches
@@ -34,10 +34,10 @@ rt13662				open	marka	// rrset-order fixed
 rt13753				review	
 rt13771				review	
 rt14616				review	
-rt14673				review	
+rt14673				closed	
 rt14695				review	
 rt14775				review	
-rt14801				review	
+rt14801				closed	
 rt14802				closed	
 rt14814				review	
 rt14815				open	marka