pullup:

1010.   [bug]           The server could attempt to execute a command channel
                        command after initiating server shutdown, causing
                        an assertion failure. [RT #1766]

diff --git a/CHANGES b/CHANGES
index b78c93e511adf68828c1ed58ab9b037aa90118e9..f95760829a5f328d28b2a684f43f1c32a61210e3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+1010.  [bug]           The server could attempt to execute a command channel
+                       command after initiating server shutdown, causing
+                       an assertion failure. [RT #1766]
+
 1006.  [bug]           If a KEY RR was found missing during DNSSEC validation,
                        an assertion failure could subsequently be triggered
                        in the resolver. [RT #1763]

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 9cc5afaf4660ca16df93541919bce90ecf1aa399..20584b21799fd5fd0f0c673f1d3dd42a1c545c60 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.28 2001/08/06 11:28:21 gson Exp $ */
+/* $Id: controlconf.c,v 1.28.2.1 2001/09/20 23:01:44 marka Exp $ */
 
 #include <config.h>
 
@@ -333,6 +333,10 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
        listener = conn->listener;
        secret.rstart = NULL;
 
+        /* Is the server shutting down? */
+        if (ns_g_server->task == 0)
+                goto cleanup;
+
        if (conn->ccmsg.result != ISC_R_SUCCESS) {
                if (conn->ccmsg.result != ISC_R_CANCELED &&
                    conn->ccmsg.result != ISC_R_EOF)