treat the use-ixfr option like we do with other obsolete options;

in particular, there is no need for the ARM to have a separate section about it

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 7c9c25781721346dab245ed1ba14b2e1b283adf1..e7545e600084f638b5befbef0939c395f132ec38 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.61 2000/12/02 00:14:23 gson Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.62 2000/12/02 00:25:39 gson Exp $ -->
 
 <book>
 
@@ -2767,6 +2767,15 @@ using <command>rndc stats</command>, which will dump them to the file listed
 in the <command>statistics-file</command>.  See also <xref linkend="statsfile"/>.</para></entry>
 </row>
 <row rowsep = "0">
+<entry colname = "1"><para><command>use-ixfr</command></para></entry>
+<entry colname = "2"><para></para>The <command>use-ixfr</command> option
+is deprecated in <acronym>BIND</acronym> 9. If
+you need to disable IXFR to a particular server or servers see
+the information on the <command>provide-ixfr</command> option
+in <xref linkend="server_statement_definition_and_usage"/>. See also
+<xref linkend="incremental_zone_transfers"/>.</entry>
+</row>
+<row rowsep = "0">
 <entry colname = "1"><para><command>treat-cr-as-space</command></para></entry>
 <entry colname = "2"><para>This option was used in <acronym>BIND</acronym> 8 to make
 the server treat carriage return ("<command>\r</command>") characters the same way
@@ -3425,16 +3434,6 @@ to allow for a limited amount of clock skew.</para></entry>
 </row>
 </tbody>
 </tgroup></informaltable></sect3>
-<sect3>
-        <title>Deprecated Features</title>
-
-        <para><command>use-ixfr</command> is deprecated in <acronym>BIND</acronym> 9. If
-        you need to disable IXFR to a particular server or servers see
-        the information on the <command>provide-ixfr</command> option
-        in <xref
-        linkend="server_statement_definition_and_usage"/>. See also
-        <xref linkend="incremental_zone_transfers"/>.</para>
-</sect3>
 
 <sect3 id="statsfile">
         <title>The Statistics File</title>

diff --git a/doc/misc/options b/doc/misc/options
index 4838af144eb6a065f4ad17749c1fd322139d8a7e..23e5aadc28b10ac5233e0bd3a080fa1a17d43c67 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: options,v 1.51 2000/11/28 22:44:10 gson Exp $
+$Id: options,v 1.52 2000/12/02 00:25:40 gson Exp $
 
 This is a summary of the implementation status of the various named.conf
 options in BIND 9.
@@ -55,6 +55,7 @@ options {
   [ recursion yes_or_no; ]                                 Yes
   [ rfc2308-type1 yes_or_no; ]                             No
   [ use-id-pool yes_or_no; ]                               Obsolete+
+  [ use-ixfr yes_or_no; ]                                  Obsolete
   [ treat-cr-as-space yes_or_no; ]                         Obsolete#
   [ also-notify { ip_addr; [ ip_addr; ... ] }; ]           Yes
   [ forward ( only | first ); ]                                    Yes

diff --git a/lib/dns/config/confctx.c b/lib/dns/config/confctx.c
index 0ea656ba1881138489fdc328477495744c5d20e9..0e208f480b16bcd01cd71bf6d46c3de95274aecd 100644 (file)
--- a/lib/dns/config/confctx.c
+++ b/lib/dns/config/confctx.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confctx.c,v 1.108 2000/11/28 21:43:37 gson Exp $ */
+/* $Id: confctx.c,v 1.109 2000/12/02 00:25:42 gson Exp $ */
 
 #include <config.h>
 
@@ -419,6 +419,11 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
                              "option 'use-id-pool' is obsolete");
        }
 
+       if (dns_c_ctx_getuseixfr(cfg, &bval) != ISC_R_NOTFOUND) {
+               isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
+                             DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
+                             "option 'use-ixfr' is obsolete");
+       }
 
        if (dns_c_ctx_gettreatcrasspace(cfg, &bval) != ISC_R_NOTFOUND) {
                isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,