From 5a6112ec8f8b04a7510967cee96ad68f90f1723d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 31 Mar 2021 13:29:13 +1100 Subject: [PATCH] Use journal_write_xhdr() to write the dummy transaction header Instead of journal_write(), use correct format call journal_write_xhdr() to write the dummy transaction header which looks at j->header_ver1 to determine which transaction header to write instead of always writing a zero filled journal_rawxhdr_t header. --- lib/dns/journal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/dns/journal.c b/lib/dns/journal.c index b15e77e0fb..cbc5a1c7f2 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -1101,7 +1101,6 @@ isc_result_t dns_journal_begin_transaction(dns_journal_t *j) { uint32_t offset; isc_result_t result; - journal_rawxhdr_t hdr; REQUIRE(DNS_JOURNAL_VALID(j)); REQUIRE(j->state == JOURNAL_STATE_WRITE || @@ -1128,8 +1127,7 @@ dns_journal_begin_transaction(dns_journal_t *j) { * space. It will be filled in when the transaction is * finished. */ - memset(&hdr, 0, sizeof(hdr)); - CHECK(journal_write(j, &hdr, sizeof(hdr))); + CHECK(journal_write_xhdr(j, 0, 0, 0, 0)); j->x.pos[1].offset = j->offset; j->state = JOURNAL_STATE_TRANSACTION;