pullup:

 937.   [bug]           A race when shutting down a zone could trigger a
                        INSIST() failure. [RT #1034]

diff --git a/CHANGES b/CHANGES
index 7eaba0efc48880c6e19ce2cd89344b70f3184e00..3ded2ddd05e006c7caf31aafeb006ea5214d7497 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
- 938.  [port]          aix 4.3.2 namespace clash on "struct token".
+
+ 937.  [bug]           A race when shutting down a zone could trigger a
+                       INSIST() failure. [RT #1034]
+
+ 938.  [port]          AIX 4.3.2 namespace clash on "struct token".
 
  929.  [bug]           RUNTIME_CHECK() used inappropriately in named.conf
                        parser.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 602df2b0820fe4e053077ac0925ff67ed3b68ac2..97b88bcb0779005befb4cdfb16eb5603c1fc7fbf 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.283.2.14 2001/06/08 21:46:11 gson Exp $ */
+/* $Id: zone.c,v 1.283.2.15 2001/07/18 18:07:04 gson Exp $ */
 
 #include <config.h>
 
@@ -558,12 +558,11 @@ zone_free(dns_zone_t *zone) {
        REQUIRE(zone->erefs == 0);
        REQUIRE(zone->irefs == 0);
        REQUIRE(!LOCKED_ZONE(zone));
+       REQUIRE(zone->timer == NULL);
 
        /*
         * Managed objects.  Order is important.
         */
-       if (zone->timer != NULL)
-               isc_timer_detach(&zone->timer);
        if (zone->request != NULL)
                dns_request_destroy(&zone->request); /* XXXMPA */
        INSIST(zone->readio == NULL);
@@ -1506,6 +1505,7 @@ zone_iattach(dns_zone_t *source, dns_zone_t **target) {
        REQUIRE(LOCKED_ZONE(source));
        REQUIRE(DNS_ZONE_VALID(source));
        REQUIRE(target != NULL && *target == NULL);
+       INSIST(source->irefs + isc_refcount_current(&source->erefs) > 0);
        source->irefs++;
        INSIST(source->irefs != 0);
        *target = source;
@@ -3581,7 +3581,6 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
 static void
 zone_shutdown(isc_task_t *task, isc_event_t *event) {
        dns_zone_t *zone = (dns_zone_t *) event->ev_arg;
-       isc_result_t result;
        isc_boolean_t free_needed;
 
        UNUSED(task);
@@ -3627,9 +3626,9 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
        notify_cancel(zone);
 
        if (zone->timer != NULL) {
-               result = isc_timer_reset(zone->timer, isc_timertype_inactive,
-                                        NULL, NULL, ISC_TRUE);
-               RUNTIME_CHECK(result == ISC_R_SUCCESS);
+               isc_timer_detach(&zone->timer);
+               INSIST(zone->irefs > 0);
+               zone->irefs--;
        }
 
        if (zone->view != NULL)
@@ -5294,6 +5293,11 @@ dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
                                  &zone->timer);
        if (result != ISC_R_SUCCESS)
                goto cleanup_task;
+       /*
+        * The timer "holds" a iref.
+        */
+       zone->irefs++;
+       INSIST(zone->irefs != 0);
 
        ISC_LIST_APPEND(zmgr->zones, zone, link);
        zone->zmgr = zmgr;