ISC BIND version 9.3.0. ok deraadt@

8 files changed, 161 insertions, 66 deletions

diff --git a/usr.sbin/bind/doc/misc/Makefile.in b/usr.sbin/bind/doc/misc/Makefile.in
index 1542821661b..c9b6eba1ca0 100644
--- a/usr.sbin/bind/doc/misc/Makefile.in
+++ b/usr.sbin/bind/doc/misc/Makefile.in
@@ -1,19 +1,19 @@
+# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
-# $ISC: Makefile.in,v 1.1 2001/07/26 21:31:12 gson Exp $
+# $ISC: Makefile.in,v 1.1.12.3 2004/03/08 09:04:25 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -30,7 +30,7 @@ doc man:: ${MANOBJS}
 docclean manclean maintainer-clean::
 	rm -f options
 
-options: 
+options: ../../bin/tests/cfg_test
 	../../bin/tests/cfg_test --named --grammar | \
 		${PERL} ${srcdir}/format-options.pl >options || \
 		rm -f options
diff --git a/usr.sbin/bind/doc/misc/format-options.pl b/usr.sbin/bind/doc/misc/format-options.pl
index 4f3a1ab74d4..3eda35a283e 100644
--- a/usr.sbin/bind/doc/misc/format-options.pl
+++ b/usr.sbin/bind/doc/misc/format-options.pl
@@ -1,21 +1,21 @@
 #!/usr/bin/perl
 #
+# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
-# $ISC: format-options.pl,v 1.1 2001/07/26 21:31:12 gson Exp $
+# $ISC: format-options.pl,v 1.1.206.1 2004/03/06 13:16:19 marka Exp $
 
 print <<END;
 
diff --git a/usr.sbin/bind/doc/misc/ipv6 b/usr.sbin/bind/doc/misc/ipv6
index c2cdfb1393d..bc5487eb7ba 100644
--- a/usr.sbin/bind/doc/misc/ipv6
+++ b/usr.sbin/bind/doc/misc/ipv6
@@ -1,3 +1,4 @@
+Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2000, 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
@@ -28,27 +29,40 @@ In the original drafts of the ipv6 RFC documents, binding an ipv6
 socket to the ipv6 wildcard address would also cause the socket to
 accept ipv4 connections and datagrams.  When an ipv4 packet is
 received on these systems, it is mapped into an ipv6 address.  For
-example, 1.2.3.4 would be mapped into ffff::1.2.3.4.  The intent of
+example, 1.2.3.4 would be mapped into ::ffff:1.2.3.4.  The intent of
 this mapping was to make transition from an ipv4-only application into
 ipv6 easier, by only requiring one socket to be open on a given port.
 
 Later, it was discovered that this was generally a bad idea.  For one,
 many firewalls will block connection to 1.2.3.4, but will let through
-ffff::1.2.3.4.  This, of course, is bad.  Also, access control lists
+::ffff:1.2.3.4.  This, of course, is bad.  Also, access control lists
 written to accept only ipv4 addresses were suddenly ignored unless
 they were rewritten to handle the ipv6 mapped addresses as well.
 
-In bind9, we always bind to the ipv6 wildcard port for both TCP and
-UDP, and specific addresses for ipv4 sockets.  This causes some
-interesting behavior depending on the system implementation of ipv6.
+Partly because of these problems, the latest IPv6 API introduces an
+explicit knob (the "IPV6_V6ONLY" socket option ) to turn off the ipv6
+mapped address usage.
+
+In bind9, we first check if both the advanced API and the IPV6_V6ONLY
+socket option are available.  If both of them are available, bind9
+named will bind to the ipv6 wildcard port for both TCP and UDP.
+Otherwise named will make a warning and try to bind to all available
+ipv6 addresses separately.
+
+In any case, bind9 named binds to specific addresses for ipv4 sockets.
+
+The followings are historical notes when we always bound to the ipv6
+wildcard port regardless of the availability of the API support.
+These problems should not happen with the closer checks above.
 
 
 IPV6 Sockets Accept IPV4, Specific IPV4 Addresses Bindings Fail
 ---------------------------------------------------------------
 
-The only OS which seems to do this is linux.  If an ipv6 socket is
-bound to the ipv6 wildcard socket, and a specific ipv4 socket is
-later bound (say, to 1.2.3.4 port 53) the ipv4 binding will fail.
+The only OS which seems to do this is (some kernel versions of) linux.
+If an ipv6 socket is bound to the ipv6 wildcard socket, and a specific
+ipv4 socket is later bound (say, to 1.2.3.4 port 53) the ipv4 binding
+will fail.
 
 What this means to bind9 is that the application will log warnings
 about being unable to bind to a socket because the address is already
@@ -89,11 +103,11 @@ packets.
 RELEVANT RFCs
 -------------
 
-2373:  IP Version 6 Addressing Architecture
+3513:  Internet Protocol Version 6 (IPv6) Addressing Architecture
 
-2553:  Basic Socket Interface Extensions for IPv6
+3493:  Basic Socket Interface Extensions for IPv6
 
-draft-ietf-ipngwg-rfc2292bis-01:  Advanced Sockets API for IPv6 (draft)
+3542:  Advanced Sockets Application Program Interface (API) for IPv6
 
 
-$ISC: ipv6,v 1.5 2001/01/09 21:50:27 bwelling Exp $
+$ISC: ipv6,v 1.5.206.4 2004/08/10 04:28:15 jinmei Exp $
diff --git a/usr.sbin/bind/doc/misc/migration-4to9 b/usr.sbin/bind/doc/misc/migration-4to9
index 6666136234c..81327255b45 100644
--- a/usr.sbin/bind/doc/misc/migration-4to9
+++ b/usr.sbin/bind/doc/misc/migration-4to9
@@ -1,7 +1,8 @@
+Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$ISC: migration-4to9,v 1.3 2001/05/19 01:20:16 gson Exp $
+$ISC: migration-4to9,v 1.3.206.1 2004/03/06 13:16:19 marka Exp $
 
 		   BIND 4 to BIND 9 Migration Notes
 
diff --git a/usr.sbin/bind/doc/misc/options b/usr.sbin/bind/doc/misc/options
index 7d8e2861bc8..f77e4940c58 100644
--- a/usr.sbin/bind/doc/misc/options
+++ b/usr.sbin/bind/doc/misc/options
@@ -3,6 +3,8 @@ This is a summary of the named.conf options supported by
 this version of BIND 9.
 
 options {
+        avoid-v4-udp-ports { <port>; ... };
+        avoid-v6-udp-ports { <port>; ... };
         blackhole { <address_match_element>; ... };
         coresize <size>;
         datasize <size>;
@@ -14,25 +16,28 @@ options {
         has-old-clients <boolean>; // obsolete
         heartbeat-interval <integer>;
         host-statistics <boolean>; // not implemented
+        hostname ( <quoted_string> | none );
         interface-interval <integer>;
         listen-on [ port <integer> ] { <address_match_element>; ... };
         listen-on-v6 [ port <integer> ] { <address_match_element>; ... };
         match-mapped-addresses <boolean>;
-        memstatistics-file <quoted_string>; // not implemented
+        memstatistics-file <quoted_string>;
         multiple-cnames <boolean>; // obsolete
         named-xfer <quoted_string>; // obsolete
-        pid-file <quoted_string>;
+        pid-file ( <quoted_string> | none );
         port <integer>;
+        querylog <boolean>;
+        recursing-file <quoted_string>;
         random-device <quoted_string>;
         recursive-clients <integer>;
-        rrset-order { [ class <string> ] [ type <string> ] [ name
-            <quoted_string> ] <string> <string>; ... }; // not implemented
         serial-queries <integer>; // obsolete
         serial-query-rate <integer>;
+        server-id ( <quoted_string> | none |;
         stacksize <size>;
         statistics-file <quoted_string>;
         statistics-interval <integer>; // not yet implemented
         tcp-clients <integer>;
+        tcp-listen-queue <integer>;
         tkey-dhkey <quoted_string> <integer>;
         tkey-gssapi-credential <quoted_string>;
         tkey-domain <quoted_string>;
@@ -42,14 +47,16 @@ options {
         treat-cr-as-space <boolean>; // obsolete
         use-id-pool <boolean>; // obsolete
         use-ixfr <boolean>;
-        version <quoted_string>;
+        version ( <quoted_string> | none );
         allow-recursion { <address_match_element>; ... };
-        allow-v6-synthesis { <address_match_element>; ... };
+        allow-v6-synthesis { <address_match_element>; ... }; // obsolete
         sortlist { <address_match_element>; ... };
         topology { <address_match_element>; ... }; // not implemented
         auth-nxdomain <boolean>; // default changed
         minimal-responses <boolean>;
         recursion <boolean>;
+        rrset-order { [ class <string> ] [ type <string> ] [ name
+            <quoted_string> ] <string> <string>; ... };
         provide-ixfr <boolean>;
         request-ixfr <boolean>;
         fetch-glue <boolean>; // obsolete
@@ -65,8 +72,18 @@ options {
         max-cache-ttl <integer>;
         transfer-format ( many-answers | one-answer );
         max-cache-size <size_no_default>;
-        check-names <string> <string>; // not implemented
+        check-names ( master | slave | response ) ( fail | warn | ignore );
         cache-file <quoted_string>;
+        suppress-initial-notify <boolean>; // not yet implemented
+        preferred-glue <string>;
+        dual-stack-servers [ port <integer> ] { ( <quoted_string> [port
+            <integer>] | <ipv4_address> [port <integer>] | <ipv6_address> [port <integer>] ); ... };
+        edns-udp-size <integer>;
+        root-delegation-only [ exclude { <quoted_string>; ... } ];
+        disable-algorithms <string> { <string>; ... };
+        dnssec-enable <boolean>;
+        dnssec-lookaside <string> trust-anchor <string>;
+        dnssec-must-be-secure <string> <boolean>;
         allow-query { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -80,10 +97,10 @@ options {
         forward ( first | only );
         forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> )
             [ port <integer> ]; ... };
+        ixfr-from-differences <boolean>;
         maintain-ixfr-base <boolean>; // obsolete
         max-ixfr-log-size <size>; // obsolete
-        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
-        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+        max-journal-size <size_no_default>;
         max-transfer-time-in <integer>;
         max-transfer-time-out <integer>;
         max-transfer-idle-in <integer>;
@@ -92,8 +109,17 @@ options {
         min-retry-time <integer>;
         max-refresh-time <integer>;
         min-refresh-time <integer>;
+        multi-master <boolean>;
         sig-validity-interval <integer>;
+        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
+            ];
+        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
+            * ) ];
+        use-alt-transfer-source <boolean>;
         zone-statistics <boolean>;
+        key-directory <quoted_string>;
 };
 
 controls {
@@ -104,13 +130,16 @@ controls {
 
 acl <string> { <address_match_element>; ... };
 
+masters <string> [ port <integer> ] { ( <masters> | <ipv4_address> [port
+    <integer>] | <ipv6_address> [port <integer>] ) [ key <string> ]; ... };
+
 logging {
         channel <string> {
-                file <logfile>;
+                file <log_file>;
                 syslog <optional_facility>;
                 null;
                 stderr;
-                severity <logseverity>;
+                severity <log_severity>;
                 print-time <boolean>;
                 print-severity <boolean>;
                 print-category <boolean>;
@@ -127,19 +156,21 @@ view <string> <optional_class> {
                 secret <string>;
         };
         zone <string> <optional_class> {
-                type ( master | slave | stub | hint | forward );
+                type ( master | slave | stub | hint | forward |
+                    delegation-only );
                 allow-update { <address_match_element>; ... };
                 file <quoted_string>;
                 ixfr-base <quoted_string>; // obsolete
                 ixfr-tmp-file <quoted_string>; // obsolete
-                masters [ port <integer> ] { ( <ipv4_address> |
-                    <ipv6_address> ) [ port <integer> ] [ key <string> ]; ... };
+                masters [ port <integer> ] { ( <masters> | <ipv4_address>
+                    [port <integer>] | <ipv6_address> [port <integer>] ) [ key <string> ]; ... };
                 pubkey <integer> <integer> <integer> <quoted_string>; //
                     obsolete
                 update-policy { ( grant | deny ) <string> ( name |
                     subdomain | wildcard | self ) <string> <rrtypelist>; ... };
                 database <string>;
-                check-names <string>; // not implemented
+                delegation-only <boolean>;
+                check-names ( fail | warn | ignore );
                 allow-query { <address_match_element>; ... };
                 allow-transfer { <address_match_element>; ... };
                 allow-update-forwarding { <address_match_element>; ... };
@@ -155,12 +186,10 @@ view <string> <optional_class> {
                 forward ( first | only );
                 forwarders [ port <integer> ] { ( <ipv4_address> |
                     <ipv6_address> ) [ port <integer> ]; ... };
+                ixfr-from-differences <boolean>;
                 maintain-ixfr-base <boolean>; // obsolete
                 max-ixfr-log-size <size>; // obsolete
-                transfer-source ( <ipv4_address> | * ) [ port ( <integer> |
-                    * ) ];
-                transfer-source-v6 ( <ipv6_address> | * ) [ port (
-                    <integer> | * ) ];
+                max-journal-size <size_no_default>;
                 max-transfer-time-in <integer>;
                 max-transfer-time-out <integer>;
                 max-transfer-idle-in <integer>;
@@ -169,10 +198,21 @@ view <string> <optional_class> {
                 min-retry-time <integer>;
                 max-refresh-time <integer>;
                 min-refresh-time <integer>;
+                multi-master <boolean>;
                 sig-validity-interval <integer>;
+                transfer-source ( <ipv4_address> | * ) [ port ( <integer> |
+                    * ) ];
+                transfer-source-v6 ( <ipv6_address> | * ) [ port (
+                    <integer> | * ) ];
+                alt-transfer-source ( <ipv4_address> | * ) [ port (
+                    <integer> | * ) ];
+                alt-transfer-source-v6 ( <ipv6_address> | * ) [ port (
+                    <integer> | * ) ];
+                use-alt-transfer-source <boolean>;
                 zone-statistics <boolean>;
+                key-directory <quoted_string>;
         };
-        server {
+        server <netaddr> {
                 bogus <boolean>;
                 provide-ixfr <boolean>;
                 request-ixfr <boolean>;
@@ -181,16 +221,22 @@ view <string> <optional_class> {
                 transfer-format ( many-answers | one-answer );
                 keys <server_key>;
                 edns <boolean>;
+                transfer-source ( <ipv4_address> | * ) [ port ( <integer> |
+                    * ) ];
+                transfer-source-v6 ( <ipv6_address> | * ) [ port (
+                    <integer> | * ) ];
         };
         trusted-keys { <string> <integer> <integer> <integer>
             <quoted_string>; ... };
         allow-recursion { <address_match_element>; ... };
-        allow-v6-synthesis { <address_match_element>; ... };
+        allow-v6-synthesis { <address_match_element>; ... }; // obsolete
         sortlist { <address_match_element>; ... };
         topology { <address_match_element>; ... }; // not implemented
         auth-nxdomain <boolean>; // default changed
         minimal-responses <boolean>;
         recursion <boolean>;
+        rrset-order { [ class <string> ] [ type <string> ] [ name
+            <quoted_string> ] <string> <string>; ... };
         provide-ixfr <boolean>;
         request-ixfr <boolean>;
         fetch-glue <boolean>; // obsolete
@@ -206,8 +252,18 @@ view <string> <optional_class> {
         max-cache-ttl <integer>;
         transfer-format ( many-answers | one-answer );
         max-cache-size <size_no_default>;
-        check-names <string> <string>; // not implemented
+        check-names ( master | slave | response ) ( fail | warn | ignore );
         cache-file <quoted_string>;
+        suppress-initial-notify <boolean>; // not yet implemented
+        preferred-glue <string>;
+        dual-stack-servers [ port <integer> ] { ( <quoted_string> [port
+            <integer>] | <ipv4_address> [port <integer>] | <ipv6_address> [port <integer>] ); ... };
+        edns-udp-size <integer>;
+        root-delegation-only [ exclude { <quoted_string>; ... } ];
+        disable-algorithms <string> { <string>; ... };
+        dnssec-enable <boolean>;
+        dnssec-lookaside <string> trust-anchor <string>;
+        dnssec-must-be-secure <string> <boolean>;
         allow-query { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -221,10 +277,10 @@ view <string> <optional_class> {
         forward ( first | only );
         forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> )
             [ port <integer> ]; ... };
+        ixfr-from-differences <boolean>;
         maintain-ixfr-base <boolean>; // obsolete
         max-ixfr-log-size <size>; // obsolete
-        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
-        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+        max-journal-size <size_no_default>;
         max-transfer-time-in <integer>;
         max-transfer-time-out <integer>;
         max-transfer-idle-in <integer>;
@@ -233,8 +289,17 @@ view <string> <optional_class> {
         min-retry-time <integer>;
         max-refresh-time <integer>;
         min-refresh-time <integer>;
+        multi-master <boolean>;
         sig-validity-interval <integer>;
+        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
+            ];
+        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
+            * ) ];
+        use-alt-transfer-source <boolean>;
         zone-statistics <boolean>;
+        key-directory <quoted_string>;
 };
 
 lwres {
@@ -251,18 +316,19 @@ key <string> {
 };
 
 zone <string> <optional_class> {
-        type ( master | slave | stub | hint | forward );
+        type ( master | slave | stub | hint | forward | delegation-only );
         allow-update { <address_match_element>; ... };
         file <quoted_string>;
         ixfr-base <quoted_string>; // obsolete
         ixfr-tmp-file <quoted_string>; // obsolete
-        masters [ port <integer> ] { ( <ipv4_address> | <ipv6_address> ) [
-            port <integer> ] [ key <string> ]; ... };
+        masters [ port <integer> ] { ( <masters> | <ipv4_address> [port
+            <integer>] | <ipv6_address> [port <integer>] ) [ key <string> ]; ... };
         pubkey <integer> <integer> <integer> <quoted_string>; // obsolete
         update-policy { ( grant | deny ) <string> ( name | subdomain |
             wildcard | self ) <string> <rrtypelist>; ... };
         database <string>;
-        check-names <string>; // not implemented
+        delegation-only <boolean>;
+        check-names ( fail | warn | ignore );
         allow-query { <address_match_element>; ... };
         allow-transfer { <address_match_element>; ... };
         allow-update-forwarding { <address_match_element>; ... };
@@ -276,10 +342,10 @@ zone <string> <optional_class> {
         forward ( first | only );
         forwarders [ port <integer> ] { ( <ipv4_address> | <ipv6_address> )
             [ port <integer> ]; ... };
+        ixfr-from-differences <boolean>;
         maintain-ixfr-base <boolean>; // obsolete
         max-ixfr-log-size <size>; // obsolete
-        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
-        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+        max-journal-size <size_no_default>;
         max-transfer-time-in <integer>;
         max-transfer-time-out <integer>;
         max-transfer-idle-in <integer>;
@@ -288,11 +354,20 @@ zone <string> <optional_class> {
         min-retry-time <integer>;
         max-refresh-time <integer>;
         min-refresh-time <integer>;
+        multi-master <boolean>;
         sig-validity-interval <integer>;
+        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+        alt-transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * )
+            ];
+        alt-transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> |
+            * ) ];
+        use-alt-transfer-source <boolean>;
         zone-statistics <boolean>;
+        key-directory <quoted_string>;
 };
 
-server {
+server <netaddr> {
         bogus <boolean>;
         provide-ixfr <boolean>;
         request-ixfr <boolean>;
@@ -301,6 +376,8 @@ server {
         transfer-format ( many-answers | one-answer );
         keys <server_key>;
         edns <boolean>;
+        transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+        transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
 };
 
 trusted-keys { <string> <integer> <integer> <integer> <quoted_string>; ... };
diff --git a/usr.sbin/bind/doc/misc/rfc-compliance b/usr.sbin/bind/doc/misc/rfc-compliance
index dbab7eb6019..1ef8b28647d 100644
--- a/usr.sbin/bind/doc/misc/rfc-compliance
+++ b/usr.sbin/bind/doc/misc/rfc-compliance
@@ -1,7 +1,8 @@
+Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$ISC: rfc-compliance,v 1.3 2001/04/10 21:51:09 bwelling Exp $
+$ISC: rfc-compliance,v 1.3.206.1 2004/03/06 13:16:20 marka Exp $
 
 BIND 9 is striving for strict compliance with IETF standards.  We
 believe this release of BIND 9 complies with the following RFCs, with
diff --git a/usr.sbin/bind/doc/misc/roadmap b/usr.sbin/bind/doc/misc/roadmap
index b9e7adcddaa..3e85526867d 100644
--- a/usr.sbin/bind/doc/misc/roadmap
+++ b/usr.sbin/bind/doc/misc/roadmap
@@ -1,7 +1,8 @@
+Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2000, 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$ISC: roadmap,v 1.1 2001/07/09 21:43:37 gson Exp $
+$ISC: roadmap,v 1.1.206.1 2004/03/06 13:16:20 marka Exp $
 
 Road Map to the BIND 9 Source Tree
 
diff --git a/usr.sbin/bind/doc/misc/sdb b/usr.sbin/bind/doc/misc/sdb
index 45d5c04a536..02236d8c119 100644
--- a/usr.sbin/bind/doc/misc/sdb
+++ b/usr.sbin/bind/doc/misc/sdb
@@ -1,3 +1,4 @@
+Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 2000, 2001  Internet Software Consortium.
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
@@ -165,4 +166,4 @@ Future Directions
 A future release may support dynamic loading of sdb drivers.
 
 
-$ISC: sdb,v 1.5 2001/05/30 23:02:03 bwelling Exp $
+$ISC: sdb,v 1.5.206.1 2004/03/06 13:16:20 marka Exp $