From: Mark Andrews <marka@isc.org>
Date: Thu, 1 Apr 2021 04:22:55 +0000 (+1100)
Subject: Rewrite managed-key journal immediately
X-Git-Tag: v9.17.12~9^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fbdf189c7c51a5fe898faae4d6d71a5f2dc9979;p=thirdparty%2Fbind9.git

Rewrite managed-key journal immediately

Both managed keys and regular zone journals need to be updated
immediately when a recoverable error is discovered.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c9bca4bd941..5f042f4f63f 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -5209,16 +5209,14 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	result = ISC_R_SUCCESS;
 
 	if (needdump) {
-		if (zone->type == dns_zone_key) {
+		if (fixjournal) {
+			DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_FIXJOURNAL);
+			zone_journal_compact(zone, zone->db, 0);
+			zone_needdump(zone, 0);
+		} else if (zone->type == dns_zone_key) {
 			zone_needdump(zone, 30);
 		} else {
-			if (fixjournal) {
-				DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_FIXJOURNAL);
-				zone_journal_compact(zone, zone->db, 0);
-				zone_needdump(zone, 0);
-			} else {
-				zone_needdump(zone, DNS_DUMP_DELAY);
-			}
+			zone_needdump(zone, DNS_DUMP_DELAY);
 		}
 	}