Import of ISC BIND version 8.3.6.

Version 8.3.5 was skipped due to bugs fixed in this version.

6 files changed, 106 insertions, 12 deletions

diff --git a/contrib/bind/doc/html/options.html b/contrib/bind/doc/html/options.html
index f124eba..9e3c0da 100644
--- a/contrib/bind/doc/html/options.html
+++ b/contrib/bind/doc/html/options.html
@@ -70,6 +70,7 @@ options {
   [ <A HREF="#sortlist">sortlist</A> { <VAR>address_match_list</VAR> }; ]
   [ rrset-order { <VAR>order_spec</VAR> ; [ <VAR>order_spec</VAR> ; ... ] }; ]
   [ preferred-glue ( A | AAAA ); ]
+  [ edns-udp-size <VAR>number</VAR>; ]
 };
 </PRE>
 <HR>
@@ -819,6 +820,16 @@ the answer to a priming query.  This can be achieved by setting
 <CODE>preferred-glue A;</CODE> which will add A records before other types
 in the additional section.
 
+<H4>EDNS</H4>
+
+Some firewalls fail to pass EDNS/UDP messages that are larger than
+certain size, 512 or the UDP reassembly buffer.  To allow EDNS to
+work across such firewalls it is necessary to advertise a EDNS
+buffer size that is small enough to not trigger failures.
+<CODE>edns-udp-size</CODE> can be use to adjust the advertised size.
+Values less than 512 will be increased to 512 and values greater than
+4096 will be truncated to 4096.
+
 <H4>Tuning</H4>
 
 <DL>
@@ -847,7 +858,7 @@ request for the root servers to be accepted.  Default 2.
 
 <HR>
 <ADDRESS>
-Last Updated: $Id: options.html,v 1.49 2002/09/09 00:19:17 marka Exp $
+Last Updated: $Id: options.html,v 1.49.6.1 2003/06/02 09:56:33 marka Exp $
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/contrib/bind/doc/man/dig.1 b/contrib/bind/doc/man/dig.1
index 6799559..40da7a0 100644
--- a/contrib/bind/doc/man/dig.1
+++ b/contrib/bind/doc/man/dig.1
@@ -1,4 +1,4 @@
-.\" $Id: dig.1,v 8.9 2002/06/18 01:53:43 marka Exp $
+.\" $Id: dig.1,v 8.11 2003/04/03 05:52:34 marka Exp $
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -246,7 +246,7 @@ one can simply
 .It Fl x Ar IPv6-address
 Convenient form to specify inverse address mapping.
 Instead of 
-.Dq Ic dig 1.0.0.0.0.0.0.0.0.0.0.0. 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ,
+.Dq Ic dig 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ,
 one can simply 
 .Dq Ic dig -x ::1 .
 .It Fl f Ar file
@@ -684,7 +684,7 @@ authored by Andrew Cherenson.
 .Sh BUGS
 .Ic Dig
 has a serious case of "creeping featurism" -- the result of
-considering several potential uses during it's development.  It would
+considering several potential uses during its development.  It would
 probably benefit from a rigorous diet.  Similarly, the print flags
 and granularity of the items they specify make evident their
 rather ad hoc genesis.
diff --git a/contrib/bind/doc/man/named-xfer.8 b/contrib/bind/doc/man/named-xfer.8
index 7d73b0f..05ccb5a 100644
--- a/contrib/bind/doc/man/named-xfer.8
+++ b/contrib/bind/doc/man/named-xfer.8
@@ -61,7 +61,7 @@
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND CHECK POINT SOFTWARE TECHNOLOGIES 
 .\" INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
 .\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.   
-.\" IN NO EVENT SHALL CHECK POINT SOFTWARE TECHNOLOGIES INCORPRATED
+.\" IN NO EVENT SHALL CHECK POINT SOFTWARE TECHNOLOGIES INCORPORATED
 .\" 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 
@@ -87,7 +87,11 @@
 .Op Fl i Ar ixfr_file
 .Op Fl t Ar trace_file
 .Op Fl p Ar port#
+.Op Fl C Ar class
 .Op Fl S 
+.Op Fl q 
+.Op Fl x Ar src_address
+.Op Fl T Ar tsig_file
 .Ar nameserver 
 .Op Sy axfr | ixfr
 .Sh DESCRIPTION
@@ -144,6 +148,9 @@ as returned by
 .Xr getservbyname @LIB_NETWORK_EXT@  
 for the service 
 .Dq Li domain .
+.It Fl C Ar class
+Defines which class to use.
+Defaults to 'IN'.
 .It Fl S
 Perform a restricted transfer of only the SOA, NS records and glue A records
 for the zone. The SOA record will not be loaded by 
@@ -154,6 +161,26 @@ determine when to verify the NS records.  See the
 directive in
 .Xr @INDOT@named @SYS_OPS_EXT@
 for more information.
+.It Fl q 
+Tells @INDOT@named-xfer to be quiet.
+.It Fl x Ar src_address
+Specifies the source address to use for this query.
+.It Fl T Ar tsig_file
+Specifies a file to transfer TSIG information to @INDOT@named-xfer.
+Multiple entries of the following format:
+.Pp
+.Bl -hang -width "IP address" -compact
+.It IP address
+When connecting to this address use this TSIG key.
+.It key name
+.It algorithm
+157 (HMAC-MD5) is the only algorithm supported.
+.It key data
+base64
+.El
+.Pp
+@INDOT@named-xfer expects this file to be temporary in nature and
+will explicitly delete this file after its use.
 .El
 .Pp
 Additional arguments are taken as name server addresses in so-called
diff --git a/contrib/bind/doc/man/named.8 b/contrib/bind/doc/man/named.8
index 882cea1..1c31c37 100644
--- a/contrib/bind/doc/man/named.8
+++ b/contrib/bind/doc/man/named.8
@@ -205,7 +205,7 @@ specified may be either a groupname or a numeric group id.
 .Pp
 .It Fl t Ar directory
 Specifies the directory the server should chroot() into as soon as it is
-finshed processing command line arguments.
+finished processing command line arguments.
 .Pp
 .It Fl w Ar directory
 Sets the working directory of the server.  The
diff --git a/contrib/bind/doc/man/named.conf.5 b/contrib/bind/doc/man/named.conf.5
index 4f5896c..2d7e627 100644
--- a/contrib/bind/doc/man/named.conf.5
+++ b/contrib/bind/doc/man/named.conf.5
@@ -767,6 +767,7 @@ options {
   [ sortlist { \fIaddress_match_list\fR }; ]
   [ rrset-order { \fIorder_spec\fR ; [ \fIorder_spec\fR ; ... ] }; ]
   [ preferred-glue ( A | AAAA ); ]
+  [ edns-udp-size \fInumber\fR; ]
 };
 .Ed
 .Ss Definition and Usage
@@ -954,7 +955,7 @@ with
 .Ic maintain-ixfr-base ,
 and 
 .Ic rfc2308-type1 
-is order dependant. 
+is order dependent. 
 .It Ic host-statistics
 If
 .Li yes ,
@@ -968,7 +969,7 @@ can consume huge amounts of memory.
 .It Ic maintain-ixfr-base
 If
 .Li yes ,
-a IXFR database file is kept for all dynamicaly updated zones.
+a IXFR database file is kept for all dynamically updated zones.
 This enables the server to answer IXFR queries which can speed up
 zone transfers enormously.
 The default is
@@ -1285,7 +1286,7 @@ address must appear in the remote end's
 .Nm allow-transfer
 option for the zones being transferred, if one is specified.  This statement sets the
 .Nm transfer-source
-for all zones, but can be overriden on a per-zone basis by includinga 
+for all zones, but can be overridden on a per-zone basis by including a
 .Nm transfer-source
 statement within the zone block in the configuration file.
 .El
@@ -1552,6 +1553,16 @@ in the answer to a priming query.
 This can be achieved by setting
 .Ic preferred-glue A;
 which will add A records before other types in the additional section. 
+.Ss EDNS
+Some firewalls fail to pass EDNS/UDP messages that are larger than
+certain size, 512 or the UDP reassembly buffer.
+To allow EDNS to
+work across such firewalls it is necessary to advertise a EDNS
+buffer size that is small enough to not trigger failures.
+.Ic edns-udp-size
+can be use to adjust the advertised size.
+Values less than 512 will be increased to 512 and values greater than
+4096 will be truncated to 4096.
 .Ss Tuning
 .Bl -tag -width 0n
 .It Ic lame-ttl
@@ -1971,7 +1982,7 @@ statement, to be used for transaction security when talking to the
 remote server.
 The
 .Ic key
-statememnt must come before the
+statement must come before the
 .Ic server
 statement that references it.
 .Pp
diff --git a/contrib/bind/doc/man/resolver.3 b/contrib/bind/doc/man/resolver.3
index c2cd915..f7c5424 100644
--- a/contrib/bind/doc/man/resolver.3
+++ b/contrib/bind/doc/man/resolver.3
@@ -16,7 +16,7 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.3	6.5 (Berkeley) 6/23/90
-.\"	$Id: resolver.3,v 8.17 2002/08/07 03:47:33 marka Exp $
+.\"	$Id: resolver.3,v 8.17.6.1 2003/06/02 09:11:27 marka Exp $
 .\"
 .Dd July 4, 2000
 .Dt RESOLVER @LIB_NETWORK_EXT_U@ 
@@ -37,6 +37,8 @@
 .Nm res_nclose ,
 .Nm res_nsendsigned ,
 .Nm res_findzonecut ,
+.Nm res_getservers ,
+.Nm res_setservers ,
 .Nm dn_comp ,
 .Nm dn_expand ,
 .Nm hstrerror ,
@@ -59,16 +61,26 @@
 .Fd #include <netinet/in.h>
 .Fd #include <arpa/nameser.h>
 .Fd #include <resolv.h>
+.Fd #include <res_update.h>
 .Vt typedef struct __res_state *res_state ;
 .Pp
+.Ft int
 .Fn res_ninit "res_state statp"
+.Ft int
 .Fn res_ourserver_p "const res_state statp" "const struct sockaddr_in *addr"
+.Ft void
 .Fn fp_resstat "const res_state statp" "FILE *fp"
+.Ft "const char *"
 .Fn res_hostalias "const res_state statp" "const char *name" "char *buf" "size_t buflen"
+.Ft int
 .Fn res_pquery "const res_state statp" "const u_char *msg" "int msglen" "FILE *fp"
+.Ft int
 .Fn res_nquery "res_state statp" "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
+.Ft int
 .Fn res_nsearch "res_state statp" "const char *dname" "int class" "int type" "u_char * answer" "int anslen"
+.Ft int
 .Fn res_nquerydomain "res_state statp" "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
+.Ft int
 .Fo res_nmkquery
 .Fa "res_state statp"
 .Fa "int op"
@@ -81,28 +93,51 @@
 .Fa "u_char *buf"
 .Fa "int buflen"
 .Fc
+.Ft int
 .Fn res_nsend "res_state statp" "const u_char *msg" "int msglen" "u_char *answer" "int anslen"
+.Ft int
 .Fn res_nupdate "res_state statp" "ns_updrec *rrecp_in"
+.Ft int
 .Fn res_nmkupdate "res_state statp" "ns_updrec *rrecp_in" "u_char *buf" "int buflen"
+.Ft void
 .Fn res_nclose "res_state statp"
+.Ft int
 .Fn res_nsendsigned "res_state statp" "const u_char *msg" "int msglen" "ns_tsig_key *key" "u_char *answer" "int anslen"
+.Ft int
 .Fn res_findzonecut "res_state statp" "const char *dname" "ns_class class" "int options" "char *zname" "size_t zsize" "struct in_addr *addrs" "int naddrs"
+.Ft int
+.Fn res_getservers "res_state statp" "union res_sockaddr_union *set" "int cnt"
+.Ft void
+.Fn res_setservers "res_state statp" "const union res_sockaddr_union *set" "int cnt"
+.Ft int
 .Fn dn_comp "const char *exp_dn" "u_char *comp_dn" "int length" "u_char **dnptrs" "u_char **lastdnptr"
+.Ft int
 .Fn dn_expand "const u_char *msg" "const u_char *eomorig" "const u_char *comp_dn" "char *exp_dn" "int  length"
+.Ft "const char *"
 .Fn hstrerror "int err"
 .Ss DEPRECATED
 .Fd #include <sys/types.h>
 .Fd #include <netinet/in.h>
 .Fd #include <arpa/nameser.h>
 .Fd #include <resolv.h>
+.Fd #include <res_update.h>
+.Ft int
 .Fn res_init "void"
+.Ft int
 .Fn res_isourserver "const struct sockaddr_in *addr"
+.Ft int
 .Fn fp_nquery "const u_char *msg" "int msglen" "FILE *fp"
+.Ft void
 .Fn p_query "const u_char *msg" "FILE *fp"
+.Ft "const char *"
 .Fn hostalias "const char *name"
+.Ft int
 .Fn res_query "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
+.Ft int
 .Fn res_search "const char *dname" "int class" "int type" "u_char *answer" "int anslen"
+.Ft int
 .Fn res_querydomain "const char *name" "const char *domain" "int class" "int type" "u_char *answer" "int anslen"
+.Ft int
 .Fo res_mkquery
 .Fa "int op"
 .Fa "const char *dname"
@@ -114,9 +149,13 @@
 .Fa "u_char *buf"
 .Fa "int buflen"
 .Fc
+.Ft int
 .Fn res_send "const u_char *msg" "int msglen" "u_char *answer" "int anslen"
+.Ft int
 .Fn res_update "ns_updrec *rrecp_in"
+.Ft void
 .Fn res_close "void"
+.Ft void
 .Fn herror "const char *s"
 .Sh DESCRIPTION
 These routines are used for making, sending and interpreting
@@ -452,6 +491,12 @@ to store the result in,
 uses a static buffer.
 .Pp
 The functions
+.Fn res_getservers
+and
+.Fn res_setservers
+are used to get and set the list of server to be queried.
+.Pp
+The functions
 .Fn res_nupdate
 /
 .Fn res_update
@@ -605,4 +650,4 @@ See
 .Xr resolver @FORMAT_EXT@ ;
 RFC1032, RFC1033, RFC1034, RFC1035, RFC974;
 SMM:11, 
-.Dq Name Server Operations Guide for Sy BIND
+.Dq Name Server Operations Guide for BIND