From: Andreas Gustafsson <source@isc.org>
Date: Fri, 21 Jul 2000 22:46:47 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.0.0~177
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b9b91fc263ebe173aae7463b4544bd8ba32c12d3;p=thirdparty%2Fbind9.git

pullup:
 344.   [bug]           When shutting down, lwresd sometimes tried
                        to shut down its client tasks twice,
                        triggering an assertion.
---

diff --git a/CHANGES b/CHANGES
index 5029ce8a9c9..6f9c8186fbb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+
+ 344.	[bug]		When shutting down, lwresd sometimes tried
+			to shut down its client tasks twice, 
+			triggering an assertion.
+
  343.	[bug]		Although zone maintenance SOA queries and
 			notify requests were signed with TSIG keys
 			when configured for the server in case,
diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c
index aa89ea11311..c1b2f1897f8 100644
--- a/bin/named/lwresd.c
+++ b/bin/named/lwresd.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.8.2.2 2000/06/28 00:19:05 gson Exp $ */
+/* $Id: lwresd.c,v 1.8.2.3 2000/07/21 22:46:47 gson Exp $ */
 
 /*
  * Main program for the Lightweight Resolver Daemon.
@@ -89,15 +89,11 @@ mem_free(void *arg, void *mem, size_t size) {
 static void
 shutdown_lwresd(isc_task_t *task, isc_event_t *event) {
 	ns_lwresd_t *lwresd = event->ev_arg;
-	unsigned int i;
 
 	UNUSED(task);
 
 	dns_dispatchmgr_destroy(&lwresd->dispmgr);
 
-	for (i = 0; i < lwresd->ntasks; i++)
-		isc_task_shutdown(lwresd->cmgr[i].task);
-
 	/*
 	 * Wait for everything to die off by waiting for the sockets
 	 * to be detached.