add start and end serial numbers to 'named-printjournal -x'

add the starting and ending serial number from the journal
header to the output of dns_journal_print().

(cherry picked from commit 46c11726d430313cc825c720f31e273418a189e2)

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 1b473e49665175923b28d0156b0a921a6e3599f0..b15e77e0fba14b2c90af8639ef4ee3c1bfa75e82 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -907,7 +907,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos, bool retry) {
                        /* XHDR_VERSION1 -> XHDR_VERSION2 */
                        isc_log_write(
                                JOURNAL_COMMON_LOGARGS, ISC_LOG_DEBUG(3),
-                               "%s: XHDR_VERSION1 -> XHDR_VERSION2 at %u\n",
+                               "%s: XHDR_VERSION1 -> XHDR_VERSION2 at %u",
                                j->filename, pos->serial);
                        j->xhdr_version = XHDR_VERSION2;
                        result = journal_next(j, pos, true);
@@ -921,7 +921,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos, bool retry) {
                        /* XHDR_VERSION2 -> XHDR_VERSION1 */
                        isc_log_write(
                                JOURNAL_COMMON_LOGARGS, ISC_LOG_DEBUG(3),
-                               "%s: XHDR_VERSION2 -> XHDR_VERSION1 at %u\n",
+                               "%s: XHDR_VERSION2 -> XHDR_VERSION1 at %u",
                                j->filename, pos->serial);
                        j->xhdr_version = XHDR_VERSION1;
                        result = journal_next(j, pos, true);
@@ -1636,6 +1636,8 @@ dns_journal_print(isc_mem_t *mctx, uint32_t flags, const char *filename,
        if (printxhdr) {
                fprintf(file, "Journal format = %sHeader version = %d\n",
                        j->header.format + 1, j->header_ver1 ? 1 : 2);
+               fprintf(file, "Start serial = %u\n", j->header.begin.serial);
+               fprintf(file, "End serial = %u\n", j->header.end.serial);
                fprintf(file, "Index (size = %u):\n", j->header.index_size);
                for (uint32_t i = 0; i < j->header.index_size; i++) {
                        if (j->index[i].offset == 0) {