From 115019ee2cf390314f1ce9da70a9129f97f83d6b Mon Sep 17 00:00:00 2001 From: Andreas Gustafsson Date: Wed, 12 Sep 2001 18:44:54 +0000 Subject: [PATCH] replay the journal on the initial load only, as it is not needed on subsequent loads and will fail if the zone is a newly edited zone with ixfr-on-differences enabled --- lib/dns/zone.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index c66d5cf702..a8def03102 100644 --- 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.345 2001/09/12 03:46:32 marka Exp $ */ +/* $Id: zone.c,v 1.346 2001/09/12 18:44:54 gson Exp $ */ #include @@ -1202,9 +1202,11 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, else DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HASINCLUDE); /* - * Apply update log, if any. + * Apply update log, if any, on initial load. */ - if (zone->journal != NULL) { + if (zone->journal != NULL && + ! DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { result = dns_journal_rollforward(zone->mctx, db, zone->journal); if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND &&