pullup:

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

diff --git a/CHANGES b/CHANGES
index 9c67c6656240ead61394c88337aa3e3732bd4b77..ba8d410ccf8f325c339a0e615fb54b1bb668e6bb 100644 (file)
--- 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 3151ae5cce77696bc998f5d77f7ce1d207f558d0..c7908298c258db0e35ec7fc5f7c23e1bbf0a400f 100644 (file)
--- 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;