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 5029ce8a9c9ea822746bcbd2f61c5ee48667ef8b..6f9c8186fbb1e92869a9f1190d1e683967f60338 100644 (file)
--- 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 aa89ea1131133a6ebb9da6080a6c85f574ba2580..c1b2f1897f8597770c58a70dc055df66e84bc9dc 100644 (file)
--- 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.