1514. [bug] named: isc_hash_destroy() was being called to early.

                        [RT #9160]

diff --git a/CHANGES b/CHANGES
index e3b334d6e413a082adb955583fbe7ac5f8b475ae..c1a8d34b2446676a41003853ad1dfba18a548226 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1514.  [bug]           named: isc_hash_destroy() was being called to early.
+                       [RT #9160]
+
 1513.  [doc]           Add "US" to root-delgation-only exclude list.
 
 1512.  [bug]           Extend the delegation-only logging to return query

diff --git a/bin/named/main.c b/bin/named/main.c
index ba97646f5de7304db25a035b778bd1a0b7ea1031..7260ce149ddc16f498d7af0669f861b40c7853ea 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.c,v 1.130 2003/07/25 02:22:23 marka Exp $ */
+/* $Id: main.c,v 1.131 2003/09/24 23:20:54 marka Exp $ */
 
 #include <config.h>
 
@@ -510,7 +510,6 @@ static void
 destroy_managers(void) {
        ns_lwresd_shutdown();
 
-       isc_hash_destroy();
        isc_entropy_detach(&ns_g_entropy);
        /*
         * isc_taskmgr_destroy() will block until all tasks have exited,
@@ -518,6 +517,13 @@ destroy_managers(void) {
        isc_taskmgr_destroy(&ns_g_taskmgr);
        isc_timermgr_destroy(&ns_g_timermgr);
        isc_socketmgr_destroy(&ns_g_socketmgr);
+
+       /*
+        * isc_hash_destroy() cannot be called as long as a resolver may be
+        * running.  Calling this after isc_taskmgr_destroy() ensures the
+        * call is safe.
+        */
+       isc_hash_destroy();
 }
 
 static void