mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[RT #34750]
This commit is contained in:
Mark Andrews
2013-09-12 13:37:43 +10:00
parent a989ffdbb3
commit 76df835d59
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
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]

4
lib/dns/zone.c
View File

@@ -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);
}
/*