New named.conf option "ixfr-from-differences" [RT #1727]

bin/named/config.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.13 2001/09/01 01:43:23 gson Exp $ */
+/* $Id: config.c,v 1.14 2001/09/08 00:21:35 gson Exp $ */
 
 #include <config.h>
 
@@ -144,6 +144,7 @@ options {\n\
 	sig-validity-interval 30; /* days */\n\
 	zone-statistics false;\n\
 	max-journal-size unlimited;\n\
+	ixfr-from-differences false;\n\
 };";
 
 isc_result_t

bin/named/zoneconf.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.91 2001/09/04 19:20:54 gson Exp $ */
+/* $Id: zoneconf.c,v 1.92 2001/09/08 00:21:36 gson Exp $ */
 
 #include <config.h>
 
@@ -500,6 +500,12 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 			journal_size = (isc_uint32_t)value;
 		}
 		dns_zone_setjournalsize(zone, journal_size);
+
+		obj = NULL;
+		result = ns_config_get(maps, "ixfr-from-differences", &obj);
+		INSIST(result == ISC_R_SUCCESS);
+		dns_zone_setoption(zone, DNS_ZONEOPT_IXFRFROMDIFFS,
+				   cfg_obj_asboolean(obj));
 	}
 
 	/*

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.155 2001/08/28 17:37:24 gson Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.156 2001/09/08 00:21:42 gson Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -3173,6 +3173,28 @@ address match lists designed for IPv4 to fail to match.
 The use of this option for any other purpose is discouraged.
 </para></listitem></varlistentry>
 
+<varlistentry><term><command>ixfr-from-differences</command></term>
+<listitem>
+<para>
+When 'yes' and the server loads a new version of a master
+zone from its zone file or receives a new version of a slave
+file by a non-incremental zone transfer, it will compare
+the new version to the previous one and calculate a set
+of differences.  The differences are then logged in the
+zone's journal file such that the changes can be transmitted
+to downstream slaves as an incremental zone transfer.
+</para><para>
+By allowing incremental zone transfers to be used for
+non-dynamic zones, this option saves bandwidth at the
+expense of increased CPU and memory consumption at the master.
+In particular, if the new version of a zone is completely
+different from the previous one, the set of differences
+will be of a size comparable to the combined size of the
+old and new zone version, and the server will need to
+temporarily allocate memory to hold this complete
+difference set.
+</para></listitem></varlistentry>
+
 </variablelist>
 
 </sect3>
@@ -4500,6 +4522,11 @@ information for this zone, which can be dumped to the
 See the description in <xref linkend="tuning"/>.
 </para></listitem></varlistentry>
 
+<varlistentry><term><command>ixfr-from-differences</command></term>
+<listitem><para>See the description of
+<command>ixfr-from-differences</command> in <xref linkend="boolean_options"/>.</para>
+</listitem></varlistentry>
+
 </variablelist>
 
 </sect3>

doc/arm/Bv9ARM.ch06.html

@@ -91,7 +91,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ></DT
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3497"
+HREF="Bv9ARM.ch06.html#AEN3510"
 >Zone File</A
 ></DT
 ></DL
@@ -4935,6 +4935,33 @@ address match lists designed for IPv4 to fail to match.
 The use of this option for any other purpose is discouraged.
 </P
 ></DD
+><DT
+><B
+CLASS="command"
+>ixfr-from-differences</B
+></DT
+><DD
+><P
+>&#13;When 'yes' and the server loads a new version of a master
+zone from its zone file or receives a new version of a slave
+file by a non-incremental zone transfer, it will compare
+the new version to the previous one and calculate a set
+of differences.  The differences are then logged in the
+zone's journal file such that the changes can be transmitted
+to downstream slaves as an incremental zone transfer.
+</P
+><P
+>&#13;By allowing incremental zone transfers to be used for
+non-dynamic zones, this option saves bandwidth at the
+expense of increased CPU and memory consumption at the master.
+In particular, if the new version of a zone is completely
+different from the previous one, the set of differences
+will be of a size comparable to the combined size of the
+old and new zone version, and the server will need to
+temporarily allocate memory to hold this complete
+difference set.
+</P
+></DD
 ></DL
 ></DIV
 ></DIV
@@ -4943,7 +4970,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2362"
+NAME="AEN2368"
 >6.2.14.2. Forwarding</A
 ></H3
 ><P
@@ -5147,7 +5174,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2427"
+NAME="AEN2433"
 >6.2.14.4. Interfaces</A
 ></H3
 ><P
@@ -5242,7 +5269,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2453"
+NAME="AEN2459"
 >6.2.14.5. Query Address</A
 ></H3
 ><P
@@ -5674,7 +5701,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2592"
+NAME="AEN2598"
 >6.2.14.7. Operating System Resource Limits</A
 ></H3
 ><P
@@ -5794,7 +5821,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2629"
+NAME="AEN2635"
 >6.2.14.8. Server  Resource Limits</A
 ></H3
 ><P
@@ -5878,7 +5905,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2657"
+NAME="AEN2663"
 >6.2.14.9. Periodic Task Intervals</A
 ></H3
 ><P
@@ -6245,7 +6272,7 @@ CLASS="command"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN2745"
+NAME="AEN2751"
 ></A
 ><P
 ></P
@@ -6632,7 +6659,7 @@ number is identical to the number in the beginning line.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN2857"
+NAME="AEN2863"
 ></A
 ><P
 ></P
@@ -7068,7 +7095,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2972"
+NAME="AEN2978"
 >6.2.17. <B
 CLASS="command"
 >trusted-keys</B
@@ -7143,7 +7170,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2988"
+NAME="AEN2994"
 >6.2.18. <B
 CLASS="command"
 >trusted-keys</B
@@ -7178,7 +7205,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2996"
+NAME="AEN3002"
 >6.2.19. <B
 CLASS="command"
 >view</B
@@ -7253,7 +7280,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3012"
+NAME="AEN3018"
 >6.2.20. <B
 CLASS="command"
 >view</B
@@ -7904,7 +7931,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3163"
+NAME="AEN3169"
 >6.2.22. <B
 CLASS="command"
 >zone</B
@@ -7915,13 +7942,13 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3166"
+NAME="AEN3172"
 >6.2.22.1. Zone Types</A
 ></H3
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3168"
+NAME="AEN3174"
 ></A
 ><P
 ></P
@@ -8159,7 +8186,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3223"
+NAME="AEN3229"
 >6.2.22.2. Class</A
 ></H3
 ><P
@@ -8197,7 +8224,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3233"
+NAME="AEN3239"
 >6.2.22.3. Zone Options</A
 ></H3
 ><P
@@ -8710,6 +8737,22 @@ HREF="Bv9ARM.ch06.html#tuning"
 >.
 </P
 ></DD
+><DT
+><B
+CLASS="command"
+>ixfr-from-differences</B
+></DT
+><DD
+><P
+>See the description of
+<B
+CLASS="command"
+>ixfr-from-differences</B
+> in <A
+HREF="Bv9ARM.ch06.html#boolean_options"
+>Section 6.2.14.1</A
+>.</P
+></DD
 ></DL
 ></DIV
 ></DIV
@@ -8838,7 +8881,7 @@ CLASS="varname"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3467"
+NAME="AEN3480"
 ></A
 ><P
 ></P
@@ -8945,7 +8988,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3497"
+NAME="AEN3510"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -8966,7 +9009,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3502"
+NAME="AEN3515"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -8989,7 +9032,7 @@ HREF="Bv9ARM.ch06.html#rrset_ordering"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3508"
+NAME="AEN3521"
 ></A
 ><P
 ></P
@@ -9100,7 +9143,7 @@ or historical (h) and no longer in general use):</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3540"
+NAME="AEN3553"
 ></A
 ><P
 ></P
@@ -9477,7 +9520,7 @@ are currently valid in the DNS:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3652"
+NAME="AEN3665"
 ></A
 ><P
 ></P
@@ -9529,7 +9572,7 @@ data that describes the resource:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3668"
+NAME="AEN3681"
 ></A
 ><P
 ></P
@@ -9706,7 +9749,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3716"
+NAME="AEN3729"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -9736,7 +9779,7 @@ knowledge of the typical representation for the data.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3723"
+NAME="AEN3736"
 ></A
 ><P
 ></P
@@ -9945,7 +9988,7 @@ domain names.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3789"
+NAME="AEN3802"
 ></A
 ><P
 ></P
@@ -10036,7 +10079,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3817"
+NAME="AEN3830"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -10069,7 +10112,7 @@ pointed to by the CNAME.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3823"
+NAME="AEN3836"
 ></A
 ><P
 ></P
@@ -10365,7 +10408,7 @@ used in a zone file.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3915"
+NAME="AEN3928"
 ></A
 ><P
 ></P
@@ -10448,7 +10491,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3938"
+NAME="AEN3951"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10472,7 +10515,7 @@ CLASS="optional"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3943"
+NAME="AEN3956"
 ></A
 ><P
 ></P
@@ -10552,7 +10595,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3965"
+NAME="AEN3978"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -10577,7 +10620,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3972"
+NAME="AEN3985"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -10647,7 +10690,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3992"
+NAME="AEN4005"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -10729,7 +10772,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4012"
+NAME="AEN4025"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -10769,7 +10812,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4023"
+NAME="AEN4036"
 >6.3.6. <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -10848,7 +10891,7 @@ CLASS="literal"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4043"
+NAME="AEN4056"
 ></A
 ><P
 ></P

doc/arm/Bv9ARM.ch07.html

@@ -86,7 +86,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4115"
+HREF="Bv9ARM.ch07.html#AEN4128"
 ><B
 CLASS="command"
 >chroot</B
@@ -188,7 +188,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4115"
+NAME="AEN4128"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -267,7 +267,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4138"
+NAME="AEN4151"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -340,7 +340,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4156"
+NAME="AEN4169"
 >7.2.2. Using the <B
 CLASS="command"
 >setuid</B

doc/arm/Bv9ARM.ch08.html

@@ -78,17 +78,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4177"
+HREF="Bv9ARM.ch08.html#AEN4190"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4182"
+HREF="Bv9ARM.ch08.html#AEN4195"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4187"
+HREF="Bv9ARM.ch08.html#AEN4200"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -98,7 +98,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4177"
+NAME="AEN4190"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -106,7 +106,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4179"
+NAME="AEN4192"
 >8.1.1. It's not working; how can I figure out what's wrong?</A
 ></H2
 ><P
@@ -122,7 +122,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4182"
+NAME="AEN4195"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -151,7 +151,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4187"
+NAME="AEN4200"
 >8.3. Where Can I Get Help?</A
 ></H1
 ><P

doc/arm/Bv9ARM.ch09.html

@@ -72,7 +72,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4203"
+HREF="Bv9ARM.ch09.html#AEN4216"
 >Acknowledgements</A
 ></DT
 ><DT
@@ -85,7 +85,7 @@ CLASS="acronym"
 ></DT
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4244"
+HREF="Bv9ARM.ch09.html#AEN4257"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -103,7 +103,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4203"
+NAME="AEN4216"
 >A.1. Acknowledgements</A
 ></H1
 ><DIV
@@ -111,7 +111,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4205"
+NAME="AEN4218"
 >A.1.1. A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -246,7 +246,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4235"
+NAME="AEN4248"
 >A.2.1.1. HS = hesiod</A
 ></H3
 ><P
@@ -267,7 +267,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4240"
+NAME="AEN4253"
 >A.2.1.2. CH = chaos</A
 ></H3
 ><P
@@ -285,7 +285,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4244"
+NAME="AEN4257"
 >A.3. General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -324,7 +324,7 @@ Unicast address scheme. For more information, see RFC 2374.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4255"
+NAME="AEN4268"
 ></A
 ><P
 ></P
@@ -543,7 +543,7 @@ VALIGN="MIDDLE"
 <DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4324"
+NAME="AEN4337"
 ></A
 ><P
 ></P
@@ -726,7 +726,7 @@ unicast address consists of:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4379"
+NAME="AEN4392"
 ></A
 ><P
 ></P
@@ -886,19 +886,19 @@ TARGET="_top"
 </P
 ><H3
 ><A
-NAME="AEN4423"
+NAME="AEN4436"
 >Bibliography</A
 ></H3
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4424"
+NAME="AEN4437"
 >Standards</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4426"
+NAME="AEN4439"
 ></A
 ><P
 >[RFC974]&nbsp;<SPAN
@@ -915,7 +915,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4433"
+NAME="AEN4446"
 ></A
 ><P
 >[RFC1034]&nbsp;<SPAN
@@ -932,7 +932,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4440"
+NAME="AEN4453"
 ></A
 ><P
 >[RFC1035]&nbsp;<SPAN
@@ -956,7 +956,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4449"
+NAME="AEN4462"
 ></A
 ><P
 >[RFC2181]&nbsp;<SPAN
@@ -976,7 +976,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4457"
+NAME="AEN4470"
 ></A
 ><P
 >[RFC2308]&nbsp;<SPAN
@@ -996,7 +996,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4465"
+NAME="AEN4478"
 ></A
 ><P
 >[RFC1995]&nbsp;<SPAN
@@ -1016,7 +1016,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4473"
+NAME="AEN4486"
 ></A
 ><P
 >[RFC1996]&nbsp;<SPAN
@@ -1033,7 +1033,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4480"
+NAME="AEN4493"
 ></A
 ><P
 >[RFC2136]&nbsp;<SPAN
@@ -1059,7 +1059,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4497"
+NAME="AEN4510"
 ></A
 ><P
 >[RFC2845]&nbsp;<SPAN
@@ -1088,13 +1088,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4516"
+NAME="AEN4529"
 >Proposed Standards Still Under Development</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4521"
+NAME="AEN4534"
 ></A
 ><P
 >[RFC1886]&nbsp;<SPAN
@@ -1117,7 +1117,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4533"
+NAME="AEN4546"
 ></A
 ><P
 >[RFC2065]&nbsp;<SPAN
@@ -1137,7 +1137,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4545"
+NAME="AEN4558"
 ></A
 ><P
 >[RFC2137]&nbsp;<SPAN
@@ -1154,7 +1154,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4553"
+NAME="AEN4566"
 >Other Important RFCs About <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1163,7 +1163,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4556"
+NAME="AEN4569"
 ></A
 ><P
 >[RFC1535]&nbsp;<SPAN
@@ -1183,7 +1183,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4564"
+NAME="AEN4577"
 ></A
 ><P
 >[RFC1536]&nbsp;<SPAN
@@ -1215,7 +1215,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4585"
+NAME="AEN4598"
 ></A
 ><P
 >[RFC1982]&nbsp;<SPAN
@@ -1235,13 +1235,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4596"
+NAME="AEN4609"
 >Resource Record Types</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4598"
+NAME="AEN4611"
 ></A
 ><P
 >[RFC1183]&nbsp;<SPAN
@@ -1270,7 +1270,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4616"
+NAME="AEN4629"
 ></A
 ><P
 >[RFC1706]&nbsp;<SPAN
@@ -1293,7 +1293,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4628"
+NAME="AEN4641"
 ></A
 ><P
 >[RFC2168]&nbsp;<SPAN
@@ -1314,7 +1314,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4639"
+NAME="AEN4652"
 ></A
 ><P
 >[RFC1876]&nbsp;<SPAN
@@ -1341,7 +1341,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4656"
+NAME="AEN4669"
 ></A
 ><P
 >[RFC2052]&nbsp;<SPAN
@@ -1365,7 +1365,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4668"
+NAME="AEN4681"
 ></A
 ><P
 >[RFC2163]&nbsp;<SPAN
@@ -1386,7 +1386,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4676"
+NAME="AEN4689"
 ></A
 ><P
 >[RFC2230]&nbsp;<SPAN
@@ -1406,7 +1406,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4684"
+NAME="AEN4697"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1415,7 +1415,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4687"
+NAME="AEN4700"
 ></A
 ><P
 >[RFC1101]&nbsp;<SPAN
@@ -1435,7 +1435,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4695"
+NAME="AEN4708"
 ></A
 ><P
 >[RFC1123]&nbsp;<SPAN
@@ -1452,7 +1452,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4702"
+NAME="AEN4715"
 ></A
 ><P
 >[RFC1591]&nbsp;<SPAN
@@ -1469,7 +1469,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4709"
+NAME="AEN4722"
 ></A
 ><P
 >[RFC2317]&nbsp;<SPAN
@@ -1492,7 +1492,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4723"
+NAME="AEN4736"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1501,7 +1501,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4726"
+NAME="AEN4739"
 ></A
 ><P
 >[RFC1537]&nbsp;<SPAN
@@ -1521,7 +1521,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4734"
+NAME="AEN4747"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1541,7 +1541,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4742"
+NAME="AEN4755"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1561,7 +1561,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4750"
+NAME="AEN4763"
 ></A
 ><P
 >[RFC2010]&nbsp;<SPAN
@@ -1581,7 +1581,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4761"
+NAME="AEN4774"
 ></A
 ><P
 >[RFC2219]&nbsp;<SPAN
@@ -1604,7 +1604,7 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4773"
+NAME="AEN4786"
 >Other <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1613,7 +1613,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4779"
+NAME="AEN4792"
 ></A
 ><P
 >[RFC1464]&nbsp;<SPAN
@@ -1630,7 +1630,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4786"
+NAME="AEN4799"
 ></A
 ><P
 >[RFC1713]&nbsp;<SPAN
@@ -1650,7 +1650,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4794"
+NAME="AEN4807"
 ></A
 ><P
 >[RFC1794]&nbsp;<SPAN
@@ -1670,7 +1670,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4802"
+NAME="AEN4815"
 ></A
 ><P
 >[RFC2240]&nbsp;<SPAN
@@ -1687,7 +1687,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4809"
+NAME="AEN4822"
 ></A
 ><P
 >[RFC2345]&nbsp;<SPAN
@@ -1710,7 +1710,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4823"
+NAME="AEN4836"
 ></A
 ><P
 >[RFC2352]&nbsp;<SPAN
@@ -1727,13 +1727,13 @@ STYLE="margin-left=0.5in"
 ><H1
 CLASS="bibliodiv"
 ><A
-NAME="AEN4830"
+NAME="AEN4843"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H1
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4832"
+NAME="AEN4845"
 ></A
 ><P
 >[RFC1712]&nbsp;<SPAN
@@ -1784,7 +1784,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4853"
+NAME="AEN4866"
 >A.4.3. Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -1794,13 +1794,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN4857"
+NAME="AEN4870"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4858"
+NAME="AEN4871"
 ></A
 ><P
 ><SPAN

doc/arm/Bv9ARM.html

@@ -542,7 +542,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.17. <A
-HREF="Bv9ARM.ch06.html#AEN2972"
+HREF="Bv9ARM.ch06.html#AEN2978"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -550,7 +550,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.18. <A
-HREF="Bv9ARM.ch06.html#AEN2988"
+HREF="Bv9ARM.ch06.html#AEN2994"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -559,7 +559,7 @@ and Usage</A
 ></DT
 ><DT
 >6.2.19. <A
-HREF="Bv9ARM.ch06.html#AEN2996"
+HREF="Bv9ARM.ch06.html#AEN3002"
 ><B
 CLASS="command"
 >view</B
@@ -567,7 +567,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.20. <A
-HREF="Bv9ARM.ch06.html#AEN3012"
+HREF="Bv9ARM.ch06.html#AEN3018"
 ><B
 CLASS="command"
 >view</B
@@ -584,7 +584,7 @@ Statement Grammar</A
 ></DT
 ><DT
 >6.2.22. <A
-HREF="Bv9ARM.ch06.html#AEN3163"
+HREF="Bv9ARM.ch06.html#AEN3169"
 ><B
 CLASS="command"
 >zone</B
@@ -594,7 +594,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3497"
+HREF="Bv9ARM.ch06.html#AEN3510"
 >Zone File</A
 ></DT
 ><DD
@@ -606,7 +606,7 @@ HREF="Bv9ARM.ch06.html#types_of_resource_records_and_when_to_use_them"
 ></DT
 ><DT
 >6.3.2. <A
-HREF="Bv9ARM.ch06.html#AEN3817"
+HREF="Bv9ARM.ch06.html#AEN3830"
 >Discussion of MX Records</A
 ></DT
 ><DT
@@ -616,17 +616,17 @@ HREF="Bv9ARM.ch06.html#Setting_TTLs"
 ></DT
 ><DT
 >6.3.4. <A
-HREF="Bv9ARM.ch06.html#AEN3938"
+HREF="Bv9ARM.ch06.html#AEN3951"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN3965"
+HREF="Bv9ARM.ch06.html#AEN3978"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN4023"
+HREF="Bv9ARM.ch06.html#AEN4036"
 ><SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -656,7 +656,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4115"
+HREF="Bv9ARM.ch07.html#AEN4128"
 ><B
 CLASS="command"
 >chroot</B
@@ -670,7 +670,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN4138"
+HREF="Bv9ARM.ch07.html#AEN4151"
 >The <B
 CLASS="command"
 >chroot</B
@@ -678,7 +678,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN4156"
+HREF="Bv9ARM.ch07.html#AEN4169"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -702,26 +702,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4177"
+HREF="Bv9ARM.ch08.html#AEN4190"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN4179"
+HREF="Bv9ARM.ch08.html#AEN4192"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4182"
+HREF="Bv9ARM.ch08.html#AEN4195"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4187"
+HREF="Bv9ARM.ch08.html#AEN4200"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -735,14 +735,14 @@ HREF="Bv9ARM.ch09.html"
 ><DL
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4203"
+HREF="Bv9ARM.ch09.html#AEN4216"
 >Acknowledgements</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN4205"
+HREF="Bv9ARM.ch09.html#AEN4218"
 >A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -772,7 +772,7 @@ HREF="Bv9ARM.ch09.html#classes_of_resource_records"
 ></DD
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4244"
+HREF="Bv9ARM.ch09.html#AEN4257"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -806,7 +806,7 @@ HREF="Bv9ARM.ch09.html#internet_drafts"
 ></DT
 ><DT
 >A.4.3. <A
-HREF="Bv9ARM.ch09.html#AEN4853"
+HREF="Bv9ARM.ch09.html#AEN4866"
 >Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN

doc/misc/options

@@ -26,7 +26,7 @@ options {
         random-device <quoted_string>;
         recursive-clients <integer>;
         rrset-order { [ class <string> ] [ type <string> ] [ name
-            <quoted_string> ] <string> <string>; ... };
+            <quoted_string> ] <string> <string>; ... }; // not implemented
         serial-queries <integer>; // obsolete
         serial-query-rate <integer>;
         stacksize <size>;
@@ -54,6 +54,7 @@ options {
         recursion <boolean>;
         provide-ixfr <boolean>;
         request-ixfr <boolean>;
+        try-edns <boolean>;
         fetch-glue <boolean>; // obsolete
         rfc2308-type1 <boolean>; // not yet implemented
         additional-from-auth <boolean>;
@@ -133,6 +134,7 @@ view <string> <optional_class> {
                 file <quoted_string>;
                 ixfr-base <quoted_string>; // obsolete
                 ixfr-tmp-file <quoted_string>; // obsolete
+                max-journal-size <size>;
                 masters [ port <integer> ] { ( <ipv4_address> |
                     <ipv6_address> ) [ port <integer> ] [ key <string> ]; ... };
                 pubkey <integer> <integer> <integer> <quoted_string>; //
@@ -190,6 +192,7 @@ view <string> <optional_class> {
         recursion <boolean>;
         provide-ixfr <boolean>;
         request-ixfr <boolean>;
+        try-edns <boolean>;
         fetch-glue <boolean>; // obsolete
         rfc2308-type1 <boolean>; // not yet implemented
         additional-from-auth <boolean>;
@@ -252,6 +255,7 @@ zone <string> <optional_class> {
         file <quoted_string>;
         ixfr-base <quoted_string>; // obsolete
         ixfr-tmp-file <quoted_string>; // obsolete
+        max-journal-size <size>;
         masters [ port <integer> ] { ( <ipv4_address> | <ipv6_address> ) [
             port <integer> ] [ key <string> ]; ... };
         pubkey <integer> <integer> <integer> <quoted_string>; // obsolete

lib/dns/include/dns/zone.h

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.106 2001/08/27 21:47:00 gson Exp $ */
+/* $Id: zone.h,v 1.107 2001/09/08 00:21:39 gson Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -44,6 +44,8 @@ typedef enum {
 #define DNS_ZONEOPT_CHILDREN	  0x00000004U	/* perform child checks */
 #define DNS_ZONEOPT_NOTIFY	  0x00000008U	/* perform NOTIFY */
 #define DNS_ZONEOPT_MANYERRORS	  0x00000010U	/* return many errors on load */
+#define DNS_ZONEOPT_IXFRFROMDIFFS 0x00000020U	/* calculate differences */
+
 #ifndef NOMINUM_PUBLIC
 /*
  * Nominum specific options build down.

lib/dns/zone.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.343 2001/09/05 15:01:52 marka Exp $ */
+/* $Id: zone.c,v 1.344 2001/09/08 00:21:38 gson Exp $ */
 
 #include <config.h>
 
@@ -196,7 +196,6 @@ struct dns_zone {
 	isc_uint32_t		maxxfrout;
 	isc_uint32_t		idlein;
 	isc_uint32_t		idleout;
-	isc_boolean_t		diff_on_reload;
 	isc_event_t		ctlevent;
 	dns_ssutable_t		*ssutable;
 	isc_uint32_t		sigvalidityinterval;
@@ -528,7 +527,6 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	zone->xfr = NULL;
 	zone->maxxfrin = MAX_XFER_TIME;
 	zone->maxxfrout = MAX_XFER_TIME;
-	zone->diff_on_reload = ISC_FALSE;
 	zone->ssutable = NULL;
 	zone->sigvalidityinterval = 30 * 24 * 3600;
 	zone->view = NULL;
@@ -4743,7 +4741,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
 	 * is enabled in the configuration.
 	 */
 	if (zone->db != NULL && zone->journal != NULL &&
-	    zone->diff_on_reload) {
+	    DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS)) {
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 			      DNS_LOGMODULE_ZONE, ISC_LOG_DEBUG(3),
 			      "generating diffs");
@@ -4752,6 +4750,8 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
 				     zone->journal);
 		if (result != ISC_R_SUCCESS)
 			goto fail;
+		if (dump)
+			zone_needdump(zone, DNS_DUMP_DELAY);
 	} else {
 		if (dump && zone->masterfile != NULL) {
 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,

lib/isccfg/parser.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.76 2001/09/06 21:52:46 gson Exp $ */
+/* $Id: parser.c,v 1.77 2001/09/08 00:21:40 gson Exp $ */
 
 #include <config.h>
 
@@ -919,6 +919,7 @@ zone_clauses[] = {
 	{ "dialup", &cfg_type_dialuptype, 0 },
 	{ "forward", &cfg_type_forwardtype, 0 },
 	{ "forwarders", &cfg_type_portiplist, 0 },
+	{ "ixfr-from-differences", &cfg_type_boolean, 0 },
 	{ "maintain-ixfr-base", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "max-ixfr-log-size", &cfg_type_size, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "transfer-source", &cfg_type_sockaddr4wild, 0 },