Commit 76df835d authored by Mark Andrews's avatar Mark Andrews
Browse files

3647. [bug] Address a race condition when shutting down a zone.

                        [RT #34750]
parent a989ffdb
3647. [bug] Address a race condition when shutting down a zone.
[RT #34750]
3646. [bug] Journal filename string could be set incorrectly,
causing garbage in log messages. [RT #34738]
......
......@@ -1000,6 +1000,7 @@ zone_free(dns_zone_t *zone) {
REQUIRE(zone->irefs == 0);
REQUIRE(!LOCKED_ZONE(zone));
REQUIRE(zone->timer == NULL);
REQUIRE(zone->zmgr == NULL);
/*
* Managed objects. Order is important.
......@@ -1014,8 +1015,6 @@ zone_free(dns_zone_t *zone) {
isc_task_detach(&zone->task);
if (zone->loadtask != NULL)
isc_task_detach(&zone->loadtask);
if (zone->zmgr != NULL)
dns_zonemgr_releasezone(zone->zmgr, zone);
/* Unmanaged objects */
for (signing = ISC_LIST_HEAD(zone->signing);
......@@ -11753,6 +11752,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
zone->statelist = NULL;
}
RWUNLOCK(&zone->zmgr->rwlock, isc_rwlocktype_write);
dns_zonemgr_releasezone(zone->zmgr, zone);
}
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment