From: Andreas Gustafsson <source@isc.org>
Date: Sun, 6 Aug 2000 22:07:25 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.0.0rc2~18
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a8ae3afb56b8d821bd3f0091b50060ca1db8fb10;p=thirdparty%2Fbind9.git

pullup:
 370.   [bug]           The error message for roll forward failures was
                        overly terse.
---

diff --git a/CHANGES b/CHANGES
index 9c67c665624..ba8d410ccf8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 	--- 9.0.0rc2 released ---
 
+ 370.	[bug]		The error messages for rollforward failures were
+			overly terse.
+
  365.	[bug]		nsupdate -k leaked memory.
 
  362.	[bug]		rndc no longer aborts if the configuration file is
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3151ae5cce7..c7908298c25 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.152.2.4 2000/07/28 22:24:47 gson Exp $ */
+/* $Id: zone.c,v 1.152.2.5 2000/08/06 22:07:25 gson Exp $ */
 
 #include <config.h>
 
@@ -698,9 +698,14 @@ dns_zone_load(dns_zone_t *zone) {
 		result = dns_journal_rollforward(zone->mctx, db,
 						 zone->journal);
 		if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND &&
-		    result != DNS_R_UPTODATE && result != DNS_R_NOJOURNAL)
+		    result != DNS_R_UPTODATE && result != DNS_R_NOJOURNAL &&
+		    result != ISC_R_RANGE) {
+			zone_log(zone, me, ISC_LOG_ERROR,
+				 "dns_journal_rollforward returned: %s",
+				 dns_result_totext(result));
 			goto cleanup;
-		if (result == ISC_R_NOTFOUND) {
+		}
+		if (result == ISC_R_NOTFOUND || result == ISC_R_RANGE) {
 			zone_log(zone, me, ISC_LOG_ERROR,
 				 "journal out of sync with zone");
 			goto cleanup;