From dd685955eec7d5695efe6af1053f628e317ad5a2 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 27 Jun 2018 18:39:51 -0700 Subject: [PATCH] use ISC_INT32_MAX as maximum (cherry picked from commit 65bf99c85a2221d426a6cadaa09cf0a76d5d92a6) --- lib/dns/journal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 82df35b7b3..9aab656d41 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -14,8 +14,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: journal.c,v 1.120 2011/12/22 07:32:41 each Exp $ */ - #include #include @@ -1043,7 +1041,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { size += t->rdata.length; } - if (size >= DNS_JOURNAL_SIZE_MAX) { + if (size >= ISC_INT32_MAX) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "dns_journal_writediff: %s: journal entry " "too big to be stored: %llu bytes", j->filename, @@ -1158,11 +1156,11 @@ dns_journal_commit(dns_journal_t *j) { * We currently don't support huge journal entries. */ total = j->x.pos[1].offset - j->x.pos[0].offset; - if (total >= DNS_JOURNAL_SIZE_MAX) { + if (total >= ISC_INT32_MAX) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "transaction too big to be stored in journal: " "%llub (max is %llub)", total, - (isc_uint64_t)DNS_JOURNAL_SIZE_MAX); + (isc_uint64_t)ISC_INT32_MAX); return (ISC_R_UNEXPECTED); }