pullup:

controls->shuttingdown should not be set on server reload.

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 9f96f67c0ff4d7db062fefee2c0b3da65f474824..17bdb7bdf5eb8db0c2f701ae9c8022f6e7637cb5 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.2.3 2001/09/21 00:28:58 marka Exp $ */
+/* $Id: controlconf.c,v 1.28.2.4 2001/09/21 03:31:17 marka Exp $ */
 
 #include <config.h>
 
@@ -559,8 +559,8 @@ control_newconn(isc_task_t *task, isc_event_t *event) {
        isc_event_free(&event);
 }
 
-void
-ns_controls_shutdown(ns_controls_t *controls) {
+static void
+controls_shutdown(ns_controls_t *controls) {
        controllistener_t *listener;
        controllistener_t *next;
 
@@ -576,6 +576,11 @@ ns_controls_shutdown(ns_controls_t *controls) {
                ISC_LIST_UNLINK(controls->listeners, listener, link);
                shutdown_listener(listener);
        }
+}
+
+void
+ns_controls_shutdown(ns_controls_t *controls) {
+       controls_shutdown(controls);
        controls->shuttingdown = ISC_TRUE;
 }
 
@@ -1206,7 +1211,7 @@ ns_controls_configure(ns_controls_t *cp, cfg_obj_t *config,
         * were in the previous configuration (if any) that do not
         * remain in the current configuration.
         */
-       ns_controls_shutdown(cp);
+       controls_shutdown(cp);
 
        /*
         * Put all of the valid listeners on the listeners list.