sync with 9.2.2-P3; new zone type "delegation-only"

discussed with deraadt@, millert@ and todd@

6 files changed, 245 insertions, 145 deletions

diff --git a/usr.sbin/bind/doc/arm/Bv9ARM-book.xml b/usr.sbin/bind/doc/arm/Bv9ARM-book.xml
index d30f4ebfe83..6e1e13052fc 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM-book.xml
+++ b/usr.sbin/bind/doc/arm/Bv9ARM-book.xml
@@ -2706,6 +2706,13 @@ in remote servers, discovered by BIND 9 when trying to query
 those servers during resolution.
 </para></entry>
 </row>
+<row rowsep = "0">
+<entry colname = "1"><para><command>delegation-only</command></para></entry>
+<entry colname = "2"><para>Delegation only.  Logs queries that have have
+been forced to NXDOMAIN as the result of a delegation-only zone or
+a <command>delegation-only</command> in a hint or stub zone declartation.
+</para></entry>
+</row>
 </tbody>
 </tgroup></informaltable>
 </sect3>
@@ -4217,7 +4224,7 @@ view "external" {
 <sect2 id="zone_statement_grammar"><title><command>zone</command>
 Statement Grammar</title>
       <programlisting>zone <replaceable>zone_name</replaceable> <optional><replaceable>class</replaceable></optional> <optional>{ 
-    type ( master | slave | hint | stub | forward ) ;
+    type ( master | slave | hint | stub | forward | delegation-only ) ;
     <optional> allow-notify { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> allow-query { <replaceable>address_match_list</replaceable> } ; </optional>
     <optional> allow-transfer { <replaceable>address_match_list</replaceable> } ; </optional>
@@ -4227,6 +4234,7 @@ Statement Grammar</title>
     <optional> also-notify { <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
     <optional> check-names (<constant>warn</constant>|<constant>fail</constant>|<constant>ignore</constant>) ; </optional>
     <optional> dialup <replaceable>dialup_option</replaceable> ; </optional>
+    <optional> delegation-only <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> file <replaceable>string</replaceable> ; </optional>
     <optional> forward (<constant>only</constant>|<constant>first</constant>) ; </optional>
     <optional> forwarders { <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
@@ -4349,6 +4357,16 @@ list of root nameservers. If no hint zone is specified for class
 IN, the server uses a compiled-in default set of root servers hints.
 Classes other than IN have no built-in defaults hints.</para></entry>
 </row>
+<row rowsep = "0">
+<entry colname = "1"><para><varname>delegation-only</varname></para></entry>
+<entry colname = "2"><para>This is used to enforce the delegation only
+status of infrastructure zones (e.g. COM, NET, ORG).  Any answer that
+is received without a explicit or implict delegation in the authority
+section will be treated as NXDOMAIN.  This does not apply to the zone
+apex.  This SHOULD NOT be applied to leaf zones.</para>
+<para><varname>delegation-only</varname> has no effect on answers received
+from forwarders.</para></entry>
+</row>
 </tbody>
 </tgroup></informaltable></sect3>
 
@@ -4454,6 +4472,13 @@ with the distribution but none are linked in by default.</para>
 <command>dialup</command> in <xref linkend="boolean_options"/>.</para>
 </listitem></varlistentry>
 
+<varlistentry><term><command>delegation-only</command></term>
+<listitem><para>The flag only applies to hint and stub zones.  If set
+to <userinput>yes</userinput> then the zone will also be treated as if it
+is also a delegation-only type zone.
+</para>
+</listitem></varlistentry>
+
 <varlistentry><term><command>forward</command></term>
 <listitem><para>Only meaningful if the zone has a forwarders
 list. The <command>only</command> value causes the lookup to fail
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html
index 4d28b4021a8..64140a3c3e0 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html
@@ -94,7 +94,7 @@ HREF="Bv9ARM.ch06.html#Configuration_File_Grammar"
 ></DT
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3565"
+HREF="Bv9ARM.ch06.html#AEN3586"
 >Zone File</A
 ></DT
 ></DL
@@ -2994,6 +2994,32 @@ those servers during resolution.
 </P
 ></TD
 ></TR
+><TR
+><TD
+WIDTH="110"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+><B
+CLASS="command"
+>delegation-only</B
+></P
+></TD
+><TD
+WIDTH="322"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+>Delegation only.  Logs queries that have have
+been forced to NXDOMAIN as the result of a delegation-only zone or
+a <B
+CLASS="command"
+>delegation-only</B
+> in a stub or forward
+zone declartation.
+</P
+></TD
+></TR
 ></TBODY
 ></TABLE
 ><P
@@ -3006,7 +3032,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1859"
+NAME="AEN1866"
 >6.2.11. <B
 CLASS="command"
 >lwres</B
@@ -3103,7 +3129,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1883"
+NAME="AEN1890"
 >6.2.12. <B
 CLASS="command"
 >lwres</B
@@ -3177,7 +3203,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN1902"
+NAME="AEN1909"
 >6.2.13. <B
 CLASS="command"
 >options</B
@@ -4166,7 +4192,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN2127"
+NAME="AEN2134"
 >6.2.14. <B
 CLASS="command"
 >options</B
@@ -5161,7 +5187,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2427"
+NAME="AEN2434"
 >6.2.14.2. Forwarding</A
 ></H3
 ><P
@@ -5365,7 +5391,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2492"
+NAME="AEN2499"
 >6.2.14.4. Interfaces</A
 ></H3
 ><P
@@ -5460,7 +5486,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2518"
+NAME="AEN2525"
 >6.2.14.5. Query Address</A
 ></H3
 ><P
@@ -5892,7 +5918,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2657"
+NAME="AEN2664"
 >6.2.14.7. Operating System Resource Limits</A
 ></H3
 ><P
@@ -6012,7 +6038,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2694"
+NAME="AEN2701"
 >6.2.14.8. Server  Resource Limits</A
 ></H3
 ><P
@@ -6096,7 +6122,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN2722"
+NAME="AEN2729"
 >6.2.14.9. Periodic Task Intervals</A
 ></H3
 ><P
@@ -6463,7 +6489,7 @@ CLASS="command"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN2810"
+NAME="AEN2817"
 ></A
 ><P
 ></P
@@ -6867,7 +6893,7 @@ number is identical to the number in the beginning line.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN2925"
+NAME="AEN2932"
 ></A
 ><P
 ></P
@@ -7303,7 +7329,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3040"
+NAME="AEN3047"
 >6.2.17. <B
 CLASS="command"
 >trusted-keys</B
@@ -7378,7 +7404,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3056"
+NAME="AEN3063"
 >6.2.18. <B
 CLASS="command"
 >trusted-keys</B
@@ -7413,7 +7439,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3064"
+NAME="AEN3071"
 >6.2.19. <B
 CLASS="command"
 >view</B
@@ -7488,7 +7514,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3080"
+NAME="AEN3087"
 >6.2.20. <B
 CLASS="command"
 >view</B
@@ -7675,7 +7701,7 @@ CLASS="replaceable"
 >] [<SPAN
 CLASS="optional"
 >{ 
-    type ( master | slave | hint | stub | forward ) ;
+    type ( master | slave | hint | stub | forward /| delegation-only ) ;
     [<SPAN
 CLASS="optional"
 > allow-notify { <TT
@@ -7790,6 +7816,15 @@ CLASS="replaceable"
 >]
     [<SPAN
 CLASS="optional"
+> delegation-only <TT
+CLASS="replaceable"
+><I
+>yes_or_no</I
+></TT
+> ; </SPAN
+>]
+    [<SPAN
+CLASS="optional"
 > file <TT
 CLASS="replaceable"
 ><I
@@ -8139,7 +8174,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3231"
+NAME="AEN3240"
 >6.2.22. <B
 CLASS="command"
 >zone</B
@@ -8150,13 +8185,13 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3234"
+NAME="AEN3243"
 >6.2.22.1. Zone Types</A
 ></H3
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3236"
+NAME="AEN3245"
 ></A
 ><P
 ></P
@@ -8383,6 +8418,29 @@ IN, the server uses a compiled-in default set of root servers hints.
 Classes other than IN have no built-in defaults hints.</P
 ></TD
 ></TR
+><TR
+><TD
+WIDTH="87"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+><TT
+CLASS="varname"
+>delegation-only</TT
+></P
+></TD
+><TD
+WIDTH="405"
+ALIGN="LEFT"
+VALIGN="MIDDLE"
+><P
+>This is used to enforce the delegation only
+status of infrastructure zones (e.g. COM, NET, ORG).  Any answer that
+is received without a explicit or implict delegation in the authority
+section will be treated as NXDOMAIN.  This does not apply to the zone
+apex.  This SHOULD NOT be applied to leaf zones.</P
+></TD
+></TR
 ></TBODY
 ></TABLE
 ><P
@@ -8394,7 +8452,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3291"
+NAME="AEN3306"
 >6.2.22.2. Class</A
 ></H3
 ><P
@@ -8432,7 +8490,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3301"
+NAME="AEN3316"
 >6.2.22.3. Zone Options</A
 ></H3
 ><P
@@ -8655,6 +8713,23 @@ HREF="Bv9ARM.ch06.html#boolean_options"
 ><DT
 ><B
 CLASS="command"
+>delegation-only</B
+></DT
+><DD
+><P
+>The flag only applies to forward and stub zones.  If set
+to <TT
+CLASS="userinput"
+><B
+>yes</B
+></TT
+> then the zone will also be treated as if it
+is also a delegation-only type zone.
+</P
+></DD
+><DT
+><B
+CLASS="command"
 >forward</B
 ></DT
 ><DD
@@ -9073,7 +9148,7 @@ CLASS="varname"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3535"
+NAME="AEN3556"
 ></A
 ><P
 ></P
@@ -9180,7 +9255,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN3565"
+NAME="AEN3586"
 >6.3. Zone File</A
 ></H1
 ><DIV
@@ -9201,7 +9276,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3570"
+NAME="AEN3591"
 >6.3.1.1. Resource Records</A
 ></H3
 ><P
@@ -9224,7 +9299,7 @@ HREF="Bv9ARM.ch06.html#rrset_ordering"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3576"
+NAME="AEN3597"
 ></A
 ><P
 ></P
@@ -9338,7 +9413,7 @@ or historical (h) and no longer in general use):</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3608"
+NAME="AEN3629"
 ></A
 ><P
 ></P
@@ -9832,7 +9907,7 @@ are currently valid in the DNS:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3755"
+NAME="AEN3776"
 ></A
 ><P
 ></P
@@ -9887,7 +9962,7 @@ data that describes the resource:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3771"
+NAME="AEN3792"
 ></A
 ><P
 ></P
@@ -10064,7 +10139,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN3819"
+NAME="AEN3840"
 >6.3.1.2. Textual expression of RRs</A
 ></H3
 ><P
@@ -10094,7 +10169,7 @@ knowledge of the typical representation for the data.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3826"
+NAME="AEN3847"
 ></A
 ><P
 ></P
@@ -10303,7 +10378,7 @@ domain names.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3892"
+NAME="AEN3913"
 ></A
 ><P
 ></P
@@ -10394,7 +10469,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN3920"
+NAME="AEN3941"
 >6.3.2. Discussion of MX Records</A
 ></H2
 ><P
@@ -10430,7 +10505,7 @@ pointed to by the CNAME.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN3926"
+NAME="AEN3947"
 ></A
 ><P
 ></P
@@ -10726,7 +10801,7 @@ used in a zone file.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4018"
+NAME="AEN4039"
 ></A
 ><P
 ></P
@@ -10809,7 +10884,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4041"
+NAME="AEN4062"
 >6.3.4. Inverse Mapping in IPv4</A
 ></H2
 ><P
@@ -10836,7 +10911,7 @@ CLASS="optional"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4046"
+NAME="AEN4067"
 ></A
 ><P
 ></P
@@ -10916,7 +10991,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4068"
+NAME="AEN4089"
 >6.3.5. Other Zone File Directives</A
 ></H2
 ><P
@@ -10941,7 +11016,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4075"
+NAME="AEN4096"
 >6.3.5.1. The <B
 CLASS="command"
 >$ORIGIN</B
@@ -11011,7 +11086,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4095"
+NAME="AEN4116"
 >6.3.5.2. The <B
 CLASS="command"
 >$INCLUDE</B
@@ -11093,7 +11168,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4115"
+NAME="AEN4136"
 >6.3.5.3. The <B
 CLASS="command"
 >$TTL</B
@@ -11133,7 +11208,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4126"
+NAME="AEN4147"
 >6.3.6. <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -11212,7 +11287,7 @@ CLASS="literal"
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4146"
+NAME="AEN4167"
 ></A
 ><P
 ></P
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html
index 82065dc7292..b1e4ba5ac88 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch07.html
@@ -89,7 +89,7 @@ HREF="Bv9ARM.ch07.html#Access_Control_Lists"
 ></DT
 ><DT
 >7.2. <A
-HREF="Bv9ARM.ch07.html#AEN4218"
+HREF="Bv9ARM.ch07.html#AEN4239"
 ><B
 CLASS="command"
 >chroot</B
@@ -197,7 +197,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4218"
+NAME="AEN4239"
 >7.2. <B
 CLASS="command"
 >chroot</B
@@ -279,7 +279,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4241"
+NAME="AEN4262"
 >7.2.1. The <B
 CLASS="command"
 >chroot</B
@@ -355,7 +355,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4259"
+NAME="AEN4280"
 >7.2.2. Using the <B
 CLASS="command"
 >setuid</B
@@ -501,4 +501,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html
index 5569e25f646..8dc8ade37f1 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch08.html
@@ -81,17 +81,17 @@ CLASS="TOC"
 ></DT
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4280"
+HREF="Bv9ARM.ch08.html#AEN4301"
 >Common Problems</A
 ></DT
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4285"
+HREF="Bv9ARM.ch08.html#AEN4306"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4290"
+HREF="Bv9ARM.ch08.html#AEN4311"
 >Where Can I Get Help?</A
 ></DT
 ></DL
@@ -101,7 +101,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4280"
+NAME="AEN4301"
 >8.1. Common Problems</A
 ></H1
 ><DIV
@@ -109,7 +109,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4282"
+NAME="AEN4303"
 >8.1.1. It's not working; how can I figure out what's wrong?</A
 ></H2
 ><P
@@ -125,7 +125,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4285"
+NAME="AEN4306"
 >8.2. Incrementing and Changing the Serial Number</A
 ></H1
 ><P
@@ -154,7 +154,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4290"
+NAME="AEN4311"
 >8.3. Where Can I Get Help?</A
 ></H1
 ><P
@@ -269,4 +269,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html
index c0298638b25..fde6cf57a67 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch09.html
@@ -74,7 +74,7 @@ CLASS="TOC"
 ></DT
 ><DT
 >A.1. <A
-HREF="Bv9ARM.ch09.html#AEN4306"
+HREF="Bv9ARM.ch09.html#AEN4327"
 >Acknowledgements</A
 ></DT
 ><DT
@@ -87,7 +87,7 @@ CLASS="acronym"
 ></DT
 ><DT
 >A.3. <A
-HREF="Bv9ARM.ch09.html#AEN4347"
+HREF="Bv9ARM.ch09.html#AEN4368"
 >General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -105,7 +105,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4306"
+NAME="AEN4327"
 >A.1. Acknowledgements</A
 ></H1
 ><DIV
@@ -113,7 +113,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4308"
+NAME="AEN4329"
 >A.1.1. A Brief History of the <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -248,7 +248,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4338"
+NAME="AEN4359"
 >A.2.1.1. HS = hesiod</A
 ></H3
 ><P
@@ -269,7 +269,7 @@ CLASS="sect3"
 ><H3
 CLASS="sect3"
 ><A
-NAME="AEN4343"
+NAME="AEN4364"
 >A.2.1.2. CH = chaos</A
 ></H3
 ><P
@@ -287,7 +287,7 @@ CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
-NAME="AEN4347"
+NAME="AEN4368"
 >A.3. General <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -335,7 +335,7 @@ Unicast address scheme. For more information, see RFC 2374.</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4358"
+NAME="AEN4379"
 ></A
 ><P
 ></P
@@ -554,7 +554,7 @@ VALIGN="MIDDLE"
 <DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4427"
+NAME="AEN4448"
 ></A
 ><P
 ></P
@@ -749,7 +749,7 @@ unicast address consists of:</P
 ><DIV
 CLASS="informaltable"
 ><A
-NAME="AEN4482"
+NAME="AEN4503"
 ></A
 ><P
 ></P
@@ -909,19 +909,19 @@ TARGET="_top"
 </P
 ><H3
 ><A
-NAME="AEN4526"
+NAME="AEN4547"
 >Bibliography</A
 ></H3
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4527"
+NAME="AEN4548"
 >Standards</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4529"
+NAME="AEN4550"
 ></A
 ><P
 >[RFC974]&nbsp;<SPAN
@@ -938,7 +938,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4536"
+NAME="AEN4557"
 ></A
 ><P
 >[RFC1034]&nbsp;<SPAN
@@ -955,7 +955,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4543"
+NAME="AEN4564"
 ></A
 ><P
 >[RFC1035]&nbsp;<SPAN
@@ -979,7 +979,7 @@ NAME="proposed_standards"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4552"
+NAME="AEN4573"
 ></A
 ><P
 >[RFC2181]&nbsp;<SPAN
@@ -999,7 +999,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4560"
+NAME="AEN4581"
 ></A
 ><P
 >[RFC2308]&nbsp;<SPAN
@@ -1019,7 +1019,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4568"
+NAME="AEN4589"
 ></A
 ><P
 >[RFC1995]&nbsp;<SPAN
@@ -1039,7 +1039,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4576"
+NAME="AEN4597"
 ></A
 ><P
 >[RFC1996]&nbsp;<SPAN
@@ -1056,7 +1056,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4583"
+NAME="AEN4604"
 ></A
 ><P
 >[RFC2136]&nbsp;<SPAN
@@ -1082,7 +1082,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4600"
+NAME="AEN4621"
 ></A
 ><P
 >[RFC2845]&nbsp;<SPAN
@@ -1111,13 +1111,13 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4619"
+NAME="AEN4640"
 >Proposed Standards Still Under Development</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4624"
+NAME="AEN4645"
 ></A
 ><P
 >[RFC1886]&nbsp;<SPAN
@@ -1140,7 +1140,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4636"
+NAME="AEN4657"
 ></A
 ><P
 >[RFC2065]&nbsp;<SPAN
@@ -1160,7 +1160,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4648"
+NAME="AEN4669"
 ></A
 ><P
 >[RFC2137]&nbsp;<SPAN
@@ -1177,7 +1177,7 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4656"
+NAME="AEN4677"
 >Other Important RFCs About <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1186,7 +1186,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4659"
+NAME="AEN4680"
 ></A
 ><P
 >[RFC1535]&nbsp;<SPAN
@@ -1206,7 +1206,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4667"
+NAME="AEN4688"
 ></A
 ><P
 >[RFC1536]&nbsp;<SPAN
@@ -1238,7 +1238,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4688"
+NAME="AEN4709"
 ></A
 ><P
 >[RFC1982]&nbsp;<SPAN
@@ -1258,13 +1258,13 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4699"
+NAME="AEN4720"
 >Resource Record Types</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4701"
+NAME="AEN4722"
 ></A
 ><P
 >[RFC1183]&nbsp;<SPAN
@@ -1293,7 +1293,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4719"
+NAME="AEN4740"
 ></A
 ><P
 >[RFC1706]&nbsp;<SPAN
@@ -1316,7 +1316,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4731"
+NAME="AEN4752"
 ></A
 ><P
 >[RFC2168]&nbsp;<SPAN
@@ -1337,7 +1337,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4742"
+NAME="AEN4763"
 ></A
 ><P
 >[RFC1876]&nbsp;<SPAN
@@ -1364,7 +1364,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4759"
+NAME="AEN4780"
 ></A
 ><P
 >[RFC2052]&nbsp;<SPAN
@@ -1388,7 +1388,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4771"
+NAME="AEN4792"
 ></A
 ><P
 >[RFC2163]&nbsp;<SPAN
@@ -1409,7 +1409,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4779"
+NAME="AEN4800"
 ></A
 ><P
 >[RFC2230]&nbsp;<SPAN
@@ -1429,7 +1429,7 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4787"
+NAME="AEN4808"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1438,7 +1438,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4790"
+NAME="AEN4811"
 ></A
 ><P
 >[RFC1101]&nbsp;<SPAN
@@ -1458,7 +1458,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4798"
+NAME="AEN4819"
 ></A
 ><P
 >[RFC1123]&nbsp;<SPAN
@@ -1475,7 +1475,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4805"
+NAME="AEN4826"
 ></A
 ><P
 >[RFC1591]&nbsp;<SPAN
@@ -1492,7 +1492,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4812"
+NAME="AEN4833"
 ></A
 ><P
 >[RFC2317]&nbsp;<SPAN
@@ -1515,7 +1515,7 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4826"
+NAME="AEN4847"
 ><SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1524,7 +1524,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4829"
+NAME="AEN4850"
 ></A
 ><P
 >[RFC1537]&nbsp;<SPAN
@@ -1544,7 +1544,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4837"
+NAME="AEN4858"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1564,7 +1564,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4845"
+NAME="AEN4866"
 ></A
 ><P
 >[RFC1912]&nbsp;<SPAN
@@ -1584,7 +1584,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4853"
+NAME="AEN4874"
 ></A
 ><P
 >[RFC2010]&nbsp;<SPAN
@@ -1604,7 +1604,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4864"
+NAME="AEN4885"
 ></A
 ><P
 >[RFC2219]&nbsp;<SPAN
@@ -1627,7 +1627,7 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4876"
+NAME="AEN4897"
 >Other <SPAN
 CLASS="acronym"
 >DNS</SPAN
@@ -1636,7 +1636,7 @@ CLASS="acronym"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4882"
+NAME="AEN4903"
 ></A
 ><P
 >[RFC1464]&nbsp;<SPAN
@@ -1653,7 +1653,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4889"
+NAME="AEN4910"
 ></A
 ><P
 >[RFC1713]&nbsp;<SPAN
@@ -1673,7 +1673,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4897"
+NAME="AEN4918"
 ></A
 ><P
 >[RFC1794]&nbsp;<SPAN
@@ -1693,7 +1693,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4905"
+NAME="AEN4926"
 ></A
 ><P
 >[RFC2240]&nbsp;<SPAN
@@ -1710,7 +1710,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4912"
+NAME="AEN4933"
 ></A
 ><P
 >[RFC2345]&nbsp;<SPAN
@@ -1733,7 +1733,7 @@ STYLE="margin-left=0.5in"
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4926"
+NAME="AEN4947"
 ></A
 ><P
 >[RFC2352]&nbsp;<SPAN
@@ -1750,13 +1750,13 @@ STYLE="margin-left=0.5in"
 ><H2
 CLASS="bibliodiv"
 ><A
-NAME="AEN4933"
+NAME="AEN4954"
 >Obsolete and Unimplemented Experimental RRs</A
 ></H2
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4935"
+NAME="AEN4956"
 ></A
 ><P
 >[RFC1712]&nbsp;<SPAN
@@ -1807,7 +1807,7 @@ CLASS="sect2"
 ><H2
 CLASS="sect2"
 ><A
-NAME="AEN4956"
+NAME="AEN4977"
 >A.4.3. Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -1817,13 +1817,13 @@ CLASS="acronym"
 ></P
 ><H3
 ><A
-NAME="AEN4960"
+NAME="AEN4981"
 >Bibliography</A
 ></H3
 ><DIV
 CLASS="biblioentry"
 ><A
-NAME="AEN4961"
+NAME="AEN4982"
 ></A
 ><P
 ><SPAN
@@ -1905,4 +1905,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.html b/usr.sbin/bind/doc/arm/Bv9ARM.html
index e1c68262bbc..8286e60087d 100644
--- a/usr.sbin/bind/doc/arm/Bv9ARM.html
+++ b/usr.sbin/bind/doc/arm/Bv9ARM.html
@@ -494,7 +494,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.11. <A
-HREF="Bv9ARM.ch06.html#AEN1859"
+HREF="Bv9ARM.ch06.html#AEN1866"
 ><B
 CLASS="command"
 >lwres</B
@@ -502,7 +502,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.12. <A
-HREF="Bv9ARM.ch06.html#AEN1883"
+HREF="Bv9ARM.ch06.html#AEN1890"
 ><B
 CLASS="command"
 >lwres</B
@@ -510,7 +510,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.13. <A
-HREF="Bv9ARM.ch06.html#AEN1902"
+HREF="Bv9ARM.ch06.html#AEN1909"
 ><B
 CLASS="command"
 >options</B
@@ -518,7 +518,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.14. <A
-HREF="Bv9ARM.ch06.html#AEN2127"
+HREF="Bv9ARM.ch06.html#AEN2134"
 ><B
 CLASS="command"
 >options</B
@@ -542,7 +542,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.17. <A
-HREF="Bv9ARM.ch06.html#AEN3040"
+HREF="Bv9ARM.ch06.html#AEN3047"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -550,7 +550,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.18. <A
-HREF="Bv9ARM.ch06.html#AEN3056"
+HREF="Bv9ARM.ch06.html#AEN3063"
 ><B
 CLASS="command"
 >trusted-keys</B
@@ -559,7 +559,7 @@ and Usage</A
 ></DT
 ><DT
 >6.2.19. <A
-HREF="Bv9ARM.ch06.html#AEN3064"
+HREF="Bv9ARM.ch06.html#AEN3071"
 ><B
 CLASS="command"
 >view</B
@@ -567,7 +567,7 @@ CLASS="command"
 ></DT
 ><DT
 >6.2.20. <A
-HREF="Bv9ARM.ch06.html#AEN3080"
+HREF="Bv9ARM.ch06.html#AEN3087"
 ><B
 CLASS="command"
 >view</B
@@ -584,7 +584,7 @@ Statement Grammar</A
 ></DT
 ><DT
 >6.2.22. <A
-HREF="Bv9ARM.ch06.html#AEN3231"
+HREF="Bv9ARM.ch06.html#AEN3240"
 ><B
 CLASS="command"
 >zone</B
@@ -594,7 +594,7 @@ CLASS="command"
 ></DD
 ><DT
 >6.3. <A
-HREF="Bv9ARM.ch06.html#AEN3565"
+HREF="Bv9ARM.ch06.html#AEN3586"
 >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#AEN3920"
+HREF="Bv9ARM.ch06.html#AEN3941"
 >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#AEN4041"
+HREF="Bv9ARM.ch06.html#AEN4062"
 >Inverse Mapping in IPv4</A
 ></DT
 ><DT
 >6.3.5. <A
-HREF="Bv9ARM.ch06.html#AEN4068"
+HREF="Bv9ARM.ch06.html#AEN4089"
 >Other Zone File Directives</A
 ></DT
 ><DT
 >6.3.6. <A
-HREF="Bv9ARM.ch06.html#AEN4126"
+HREF="Bv9ARM.ch06.html#AEN4147"
 ><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#AEN4218"
+HREF="Bv9ARM.ch07.html#AEN4239"
 ><B
 CLASS="command"
 >chroot</B
@@ -670,7 +670,7 @@ UNIX servers)</A
 ><DL
 ><DT
 >7.2.1. <A
-HREF="Bv9ARM.ch07.html#AEN4241"
+HREF="Bv9ARM.ch07.html#AEN4262"
 >The <B
 CLASS="command"
 >chroot</B
@@ -678,7 +678,7 @@ CLASS="command"
 ></DT
 ><DT
 >7.2.2. <A
-HREF="Bv9ARM.ch07.html#AEN4259"
+HREF="Bv9ARM.ch07.html#AEN4280"
 >Using the <B
 CLASS="command"
 >setuid</B
@@ -702,26 +702,26 @@ HREF="Bv9ARM.ch08.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="Bv9ARM.ch08.html#AEN4280"
+HREF="Bv9ARM.ch08.html#AEN4301"
 >Common Problems</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.1.1. <A
-HREF="Bv9ARM.ch08.html#AEN4282"
+HREF="Bv9ARM.ch08.html#AEN4303"
 >It's not working; how can I figure out what's wrong?</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.2. <A
-HREF="Bv9ARM.ch08.html#AEN4285"
+HREF="Bv9ARM.ch08.html#AEN4306"
 >Incrementing and Changing the Serial Number</A
 ></DT
 ><DT
 >8.3. <A
-HREF="Bv9ARM.ch08.html#AEN4290"
+HREF="Bv9ARM.ch08.html#AEN4311"
 >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#AEN4306"
+HREF="Bv9ARM.ch09.html#AEN4327"
 >Acknowledgements</A
 ></DT
 ><DD
 ><DL
 ><DT
 >A.1.1. <A
-HREF="Bv9ARM.ch09.html#AEN4308"
+HREF="Bv9ARM.ch09.html#AEN4329"
 >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#AEN4347"
+HREF="Bv9ARM.ch09.html#AEN4368"
 >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#AEN4956"
+HREF="Bv9ARM.ch09.html#AEN4977"
 >Other Documents About <SPAN
 CLASS="acronym"
 >BIND</SPAN
@@ -871,4 +871,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>