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 c9bca4bd94179037feb4bd7e6a0096cd1dfef33d..5f042f4f63f3bc4704fc98f49b9170db0fa70598 100644 (file)
--- 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);
                }
        }