Pullup for Andreas:

 452.   [bug]           Warn if the unimplemented option statistics-file
                        is specified in named.conf. [RT #301]

 453.   [bug]           Warn if the obsolete option maintain-ixfr-base
                        is specified in named.conf. [RT #306]

diff --git a/CHANGES b/CHANGES
index 120a559a8cfea7845396a500984efcd27dd29584..7ded6e9912577bf602cab88a821b01eec27b1dd1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+ 453.  [bug]           Warn if the obsolete option "maintain-ixfr-base"
+                       is specified in named.conf. [RT #306]
+
+ 452.  [bug]           Warn if the unimplemented option "statistics-file"
+                       is specified in named.conf. [RT #301]
+
+ 451.  [func]          Update forwarding implememted.
+ 
  445.  [bug]           Doing a 0 bit isc_bitstring_copy() of an lsb0
                        bitstring triggered a REQUIRE statement.  The REQUIRE
                        statement was incorrect. [RT #297]

diff --git a/lib/dns/config/confctx.c b/lib/dns/config/confctx.c
index 3d8708a1a0991b3d166ff4cb6ded2315ecaa82d9..f856ce81362698372b7d2b94f9efe248be838e35 100644 (file)
--- a/lib/dns/config/confctx.c
+++ b/lib/dns/config/confctx.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: confctx.c,v 1.70.2.4 2000/09/07 19:32:15 gson Exp $ */
+/* $Id: confctx.c,v 1.70.2.5 2000/09/13 23:13:23 explorer Exp $ */
 
 #include <config.h>
 
@@ -245,8 +245,16 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
                              DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
                              "option 'dump-file' is not yet implemented");
        }
-       
-               
+
+
+       if (dns_c_ctx_getstatsfilename(cfg, &cpval) != ISC_R_NOTFOUND) {
+               isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
+                             DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
+                             "option 'statistics-file' is not yet "
+                             "implemented");
+       }
+
+
        if (dns_c_ctx_getmemstatsfilename(cfg, &cpval) != ISC_R_NOTFOUND) {
                isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
                              DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
@@ -376,7 +384,14 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
                              "option 'serial-queries' is not yet "
                              "implemented");
        }
-       
+
+
+       if (dns_c_ctx_getmaintainixfrbase(cfg, &uintval) != ISC_R_NOTFOUND) {
+               isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
+                             DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
+                             "option 'maintain-ixfr-base' is obsolete");
+       }
+
 
        if (dns_c_ctx_getmaxlogsizeixfr(cfg, &uintval) != ISC_R_NOTFOUND) {
                isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,

diff --git a/lib/dns/config/confparser.y b/lib/dns/config/confparser.y
index 8ffba577604620d81879426b8b233ac8cbe7b61e..5a2b04b3b7edccd4ec4b9d9d3cee1af6e8135ef2 100644 (file)
--- a/lib/dns/config/confparser.y
+++ b/lib/dns/config/confparser.y
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-/* $Id: confparser.y,v 1.99.2.4 2000/08/22 00:46:22 gson Exp $ */
+/* $Id: confparser.y,v 1.99.2.5 2000/09/13 23:13:25 explorer Exp $ */
 
 #include <config.h>
 
@@ -790,14 +790,10 @@ option: /* Empty */
        }
        | L_MAINTAIN_IXFR_BASE yea_or_nay
        {
-               /*
-                * Backwards compatibility, treated as
-                * equivalent to provide-ixfr.
-                */
-               tmpres = dns_c_ctx_setprovideixfr(currcfg, $2);
+               tmpres = dns_c_ctx_setmaintainixfrbase(currcfg, $2);
                if (tmpres == ISC_R_EXISTS) {
                        parser_error(ISC_FALSE,
-                                    "cannot redefine provide-ixfr");
+                                    "cannot redefine maintain-ixfr-base");
                        YYABORT;
                }
        }