From: Evan Hunt <each@isc.org>
Date: Thu, 28 Jun 2018 01:39:51 +0000 (-0700)
Subject: use ISC_INT32_MAX as maximum
X-Git-Tag: v9.10.8rc2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab03badacb7d5d6f9b103555672432f302da10b;p=thirdparty%2Fbind9.git

use ISC_INT32_MAX as maximum

(cherry picked from commit 65bf99c85a2221d426a6cadaa09cf0a76d5d92a6)
---

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 942e227f571..50078fb564e 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 <config.h>
 
 #include <stdlib.h>
@@ -1044,7 +1042,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,
@@ -1159,11 +1157,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);
 	}