ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

1706. [bug] 'rndc stop' failed to cause zones to be flushed

Browse Source 
sometimes. [RT #12328]
This commit is contained in:
Mark Andrews
2004-08-27 12:25:13 +00:00
parent 908191b021
commit 823743f382
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,5 +1,8 @@
1707. [contrib] sdb/ldap updated to version 1.0-beta.
1706. [bug] 'rndc stop' failed to cause zones to be flushed
sometimes. [RT #12328]
1701. [doc] A minimal named.conf man page.
1700. [func] nslookup is no longer to be treated as deprecated.

21
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.410.18.7 2004/07/29 00:17:02 marka Exp $ */
/* $Id: zone.c,v 1.410.18.8 2004/08/27 12:25:13 marka Exp $ */
#include <config.h>
@@ -2349,8 +2349,10 @@ dump_done(void *arg, isc_result_t result) {
tresult = dns_db_getsoaserial(db, version, &serial);
if (tresult == ISC_R_SUCCESS) {
tresult = dns_journal_compact(zone->mctx, zone->journal,
serial, zone->journalsize);
tresult = dns_journal_compact(zone->mctx,
zone->journal,
serial,
zone->journalsize);
switch (tresult) {
case ISC_R_SUCCESS:
case ISC_R_NOSPACE:
@@ -4260,14 +4262,17 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
if (zone->readio != NULL)
zonemgr_cancelio(zone->readio);
if (zone->writeio != NULL)
zonemgr_cancelio(zone->writeio);
if (zone->lctx != NULL)
dns_loadctx_cancel(zone->lctx);
if (zone->dctx != NULL)
dns_dumpctx_cancel(zone->dctx);
if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FLUSH) ||
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) {
if (zone->writeio != NULL)
zonemgr_cancelio(zone->writeio);
if (zone->dctx != NULL)
dns_dumpctx_cancel(zone->dctx);
}
notify_cancel(zone);