BIND 4.9.5-P1.

libresolv and include are required until the new resolver gets integrated
into libc.

15 files changed, 220 insertions, 82 deletions

diff --git a/usr.sbin/named/man/dig.1 b/usr.sbin/named/man/dig.1
index 37be48ae94b..9ed2829a594 100644
--- a/usr.sbin/named/man/dig.1
+++ b/usr.sbin/named/man/dig.1
@@ -1,6 +1,5 @@
-.\"	$NetBSD: dig.1,v 1.1 1996/02/02 15:27:16 mrg Exp $
-.\"
-.\" $Id: dig.1,v 8.1 1994/12/15 06:24:10 vixie Exp 
+.\"	$OpenBSD: dig.1,v 1.2 1997/03/12 10:42:12 downsj Exp $
+.\" $From: dig.1,v 8.1 1994/12/15 06:24:10 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -63,7 +62,7 @@
 .\" Man page reformatted for this release by Andrew Cherenson
 .\" (arc@sgi.com)
 .\"
-.TH DIG 1 "August 30, 1990"
+.TH DIG @CMD_EXT_U@ "August 30, 1990"
 .SH NAME
 dig \- send domain name query packets to name servers
 .SH SYNOPSIS
@@ -101,7 +100,7 @@ at your disposal somewhere,  all that is required is that
 /etc/resolv.conf be present and indicate where the default
 name servers  reside,  so that  \fIserver\fP itself can be
 resolved. See 
-.IR resolver (5)
+.IR resolver (@FORMAT_EXT@)
 for information on /etc/resolv.conf.
 (WARNING: Changing /etc/resolv.conf will affect
 the standard  resolver library and  potentially several
@@ -190,7 +189,7 @@ Port number. Query a name server listening to a
 non-standard port number. Default is 53.
 .IP "\-P[\fIping-string\fP]"
 After query returns, execute a 
-.IR ping (8)
+.IR ping (@SYS_OPS_EXT@)
 command
 for response time comparison. This rather
 unelegantly makes a call to the shell. The last
@@ -260,7 +259,7 @@ subsequent lines (i.e. they are not restored to the
 "+" is used to specify an option to be changed in the
 query packet or to change \fIdig\fP output specifics. Many
 of these are the same parameters accepted by 
-.IR nslookup (8).
+.IR nslookup (@SYS_OPS_EXT@).
 If an option requires a parameter, the form is as
 follows:
 .sp 1
@@ -326,7 +325,7 @@ end
 (Note: \fIdig\fP always uses a value of 1 for num_servers.) 
 .SH DETAILS
 \fIDig\fP once required a slightly modified version of the BIND 
-.IR resolver (3)
+.IR resolver (@LIB_NETWORK_EXT@)
 library.  BIND's resolver has (as of BIND 4.9) been augmented to work
 properly with \fIDig\fP.  Essentially, \fIDig\fP is a straight-forward
 (albeit not pretty) effort of parsing arguments and setting appropriate
@@ -347,7 +346,7 @@ Steve Hotz
 hotz@isi.edu
 .SH ACKNOWLEDGMENTS
 \fIDig\fP uses functions from 
-.IR nslookup (8)
+.IR nslookup (@SYS_OPS_EXT@)
 authored by Andrew Cherenson.
 .SH BUGS
 \fIDig\fP has a serious case of "creeping featurism" -- the result of
@@ -363,4 +362,4 @@ batch mode.  If it exits abnormally (and is not caught), the entire
 batch aborts; when such an event is trapped, \fIdig\fP simply
 continues with the next query.
 .SH SEE ALSO
-named(8),  resolver(3),  resolver(5),  nslookup(8)
+@INDOT@named(@SYS_OPS_EXT@),  resolver(@LIB_NETWORK_EXT@),  resolver(@FORMAT_EXT@),  nslookup(@SYS_OPS_EXT@)
diff --git a/usr.sbin/named/man/dnsquery.1 b/usr.sbin/named/man/dnsquery.1
index cc9f2810390..f7ce2b0ca29 100644
--- a/usr.sbin/named/man/dnsquery.1
+++ b/usr.sbin/named/man/dnsquery.1
@@ -1,5 +1,4 @@
-.\"	$NetBSD: dnsquery.1,v 1.1.4.1 1996/06/14 13:18:13 mrg Exp $
-.\"
+.\"	$OpenBSD: dnsquery.1,v 1.3 1997/03/12 10:42:12 downsj Exp $
 .TH DNSQUERY 1 "10 March 1990"
 .UC 6
 .SH NAME
@@ -142,8 +141,8 @@ The name of the host (or domain) of interest.
 .br
 <resolv.h>		list of resolver flags
 .SH "SEE ALSO"
-nslookup(8)
-named(8), resolver(5)
+nslookup(1), nstest(1), nsquery(1), 
+named(8), resolver(3)
 .SH DIAGNOSTICS
 If the resolver fails to answer the query and debugging has not been
 turned on,
diff --git a/usr.sbin/named/man/gethostbyname.3 b/usr.sbin/named/man/gethostbyname.3
index 0f8137bab22..d6d2977a041 100644
--- a/usr.sbin/named/man/gethostbyname.3
+++ b/usr.sbin/named/man/gethostbyname.3
@@ -1,5 +1,4 @@
-.\"	$NetBSD: gethostbyname.3,v 1.1 1996/02/02 15:27:23 mrg Exp $
-.\"
+.\"	$OpenBSD: gethostbyname.3,v 1.2 1997/03/12 10:42:13 downsj Exp $
 .\" Copyright (c) 1983, 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -105,8 +104,10 @@ The first address in h_addr_list; this is for backward compatibility.
 .PP
 When using the nameserver,
 .I gethostbyname
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
+will search for the named host in each parent domain given in the ``search''
+directive of
+.IR resolv.conf (5)
+unless the name contains a dot.
 If the name contains no dot, and if the environment variable ``HOSTALAIASES''
 contains the name of an alias file, the alias file will first be searched
 for an alias matching the input name.
diff --git a/usr.sbin/named/man/getnetent.3 b/usr.sbin/named/man/getnetent.3
index efd80822fa5..43ac7585ba4 100644
--- a/usr.sbin/named/man/getnetent.3
+++ b/usr.sbin/named/man/getnetent.3
@@ -1,6 +1,5 @@
-.\"	$NetBSD: getnetent.3,v 1.1 1996/02/02 15:27:26 mrg Exp $
-.\"
-.\" $Id: getnetent.3,v 8.1 1994/12/15 06:24:10 vixie Exp 
+.\"	$OpenBSD: getnetent.3,v 1.2 1997/03/12 10:42:13 downsj Exp $
+.\" $From: getnetent.3,v 8.2 1996/05/09 05:59:10 vixie Exp $
 .TH getnetent 3
 .SH NAME
 getnetent, getnetbyaddr, getnetbyname, setnetent, endnetent \- get networks
@@ -15,7 +14,7 @@ entry
 .B char *\fIname\fP;
 .PP
 .B struct netent *getnetbyaddr(\fInet\fP, \fItype\fP)
-.B long \fInet\fP; int \fItype\fP;
+.B unsigned long \fInet\fP; int \fItype\fP;
 .PP
 .B void setnetent(\fIstayopen\fP)
 .B int \fIstayopen\fP;
diff --git a/usr.sbin/named/man/host.1 b/usr.sbin/named/man/host.1
index 656ea50a355..500d721969b 100644
--- a/usr.sbin/named/man/host.1
+++ b/usr.sbin/named/man/host.1
@@ -1,7 +1,8 @@
+.\"	$OpenBSD: host.1,v 1.2 1997/03/12 10:42:14 downsj Exp $
 .\"
-.\"	@(#)host.1              e07@nikhef.nl (Eric Wassenaar) 951024
+.\"	@(#)host.1              e07@nikhef.nl (Eric Wassenaar) 961010
 .\"
-.TH host 1 "951024"
+.TH host 1 "961010"
 .SH NAME
 host \- query nameserver about domain names and zones
 .SH SYNOPSIS 
@@ -79,7 +80,7 @@ special zone listing mode which has several variants (see below).
 The second argument is optional. It allows you to specify a particular
 server to query.  If you don't specify this argument, default servers
 are used, as defined by the \fB/etc/resolv.conf\fP file.
-.SH EXTENDED SYNTAX
+.SS "EXTENDED SYNTAX"
 If the \fB\-x\fP option is given, it extends the syntax in the sense
 that multiple arguments are allowed on the command line. An optional
 explicit server must now be specified using the \fB\-X\fP option as it
@@ -92,7 +93,7 @@ redirection from a file, or an interactive terminal. Note that
 these arguments are the names to be queried, and not command options.
 Everything that appears after a '#' or ';' on an input line will be
 skipped. Multiple arguments per line are allowed.
-.SH OPTIONS
+.SS OPTIONS
 There are a number of options that can be used before the specified
 arguments.  Some of these options are meaningful only to the people
 who maintain the domain database zones.
@@ -121,7 +122,7 @@ and \fBA\fP, \fBNS\fP, and \fBPTR\fP for zone listings.
 is equivalent to \fB\-t ANY\fP.
 Note that this gives you "anything available" (currently cached) and
 not "all defined data" if a non-authoritative server is queried.
-.SH SPECIAL MODES
+.SS "SPECIAL MODES"
 The following options put the program in a special mode.
 .TP 4
 .BI \-l " zone"
@@ -207,7 +208,7 @@ If the \fB\-A\fP flag is specified along with any zone listing option,
 a reverse lookup of the address in each encountered A record is performed,
 and it is checked whether it is registered and maps back to the name of
 the A record.
-.SH SPECIAL OPTIONS
+.SS "SPECIAL OPTIONS"
 The following options apply only to the special zone listing modes.
 .TP 4
 .BI \-L " level"
@@ -244,7 +245,7 @@ prohibits zone transfers for the zones given by the comma-separated
 list \fIskipzone\fP. This may be used during recursive zone listings
 when certain zones are known to contain bogus information which
 should be excluded from further processing.
-.SH COMMON OPTIONS
+.SS "COMMON OPTIONS"
 The following options can be used in both normal mode and domain
 listing mode.
 .TP 4
@@ -299,7 +300,7 @@ By default the ttl is shown only in verbose mode.
 .B \-Z
 prints the selected resource record output in full zone file format,
 including trailing dot in domain names, plus ttl value and class name.
-.SH OTHER OPTIONS
+.SS "OTHER OPTIONS"
 The following options are used only in special circumstances.
 .TP 4
 .BI \-c " class"
@@ -371,7 +372,7 @@ nameserver address tried.
 .TP
 .B \-V
 prints just the version number of the \fBhost\fP program, and exits.
-.SH DEFAULT OPTIONS
+.SS "DEFAULT OPTIONS"
 Default options and parameters can be preset in an environment
 variable \fBHOST_DEFAULTS\fP using the same syntax as on the command
 line. They will be evaluated before the command line arguments.
@@ -427,7 +428,7 @@ Mailbox or mail list information (request domain name, error domain name)
 Mail exchanger (preference value, domain name)
 .TP
 .B TXT
-Descriptive text (string)
+Descriptive text (one or more strings)
 .TP
 .B UINFO
 User information (string)
@@ -470,9 +471,9 @@ Route through host (preference value, domain name)
 .PP
 The following types have been defined in RFC 1348, but
 are not yet in general use. They are recognized by this program.
-RFC 1348 has already been obsoleted by RFC 1637, which defines
-a new experimental usage of NSAP records. This program has now
-hooks to manipulate them.
+RFC 1348 has already been obsoleted by RFC 1637 and RFC 1706,
+which defines a new experimental usage of NSAP records.
+This program has now hooks to manipulate them.
 .TP 10
 .B NSAP
 NSAP address (encoded address)
@@ -498,13 +499,45 @@ Security signature
 .TP
 .B KEY
 Security key
-.TP
+.PP
+The IP v6 address architecture and DNS extensions are defined in
+RFC 1884 and RFC 1886.
+.TP 10
 .B AAAA
-IP v6 address
-.TP
+IP v6 address (address spec with colons)
+.PP
+The following type is documented in RFC 1876.
+.TP 10
 .B LOC
-Geographical location
-.SH FAILURE MESSAGES
+Geographical location (latitude, longitude, altitude, precision)
+.PP
+The following types have been proposed, but are still in draft.
+.TP 10
+.B NXT
+Next valid record
+.TP
+.B EID
+Endpoint identifier
+.TP
+.B NIMLOC
+Nimrod locator
+.TP
+.B SRV
+Internet service information
+.TP
+.B ATMA
+ATM address
+.TP
+.B NAPTR
+Naming authority URN
+.SH EXAMPLES
+A very good summary and validation of an entire zone can be obtained
+with the following command:
+.sp
+	\fBhost \-G \-S \-C \-A \-L 1\fP \fIzone\fP
+.sp
+.SH DIAGNOSTICS
+.SS "FAILURE MESSAGES"
 The following messages are printed to show the reason
 of failure for a particular query. The name of an explicit
 server, if specified, may be included. If a special class
@@ -575,7 +608,7 @@ addresses for any of them.
 No nameservers for \fIzone\fP responded
 When trying all nameservers in succession to do a zone transfer,
 none of them were able or willing to provide it.
-.SH WARNING AND ERROR MESSAGES
+.SS "WARNING AND ERROR MESSAGES"
 Miscellaneous warning messages may be generated.
 They are preceded by " !!! " and indicate some non-fatal condition,
 usually during the interpretation of the retrieved data.
@@ -733,26 +766,29 @@ as well. What you get depends on which server you happen to query.
 \fIserver1\fP and \fIserver2\fP have different defttl for \fIzone\fP
 If the SOA record is different, the zone data is probably different
 as well. What you get depends on which server you happen to query.
-.SH EXIT STATUS
+.SH "EXIT STATUS"
 The program returns a zero exit status if the requested information
 could be retrieved successfully, or in case zone listings or SOA
 checks were performed without any serious error.
 Otherwise it returns a non-zero exit status.
-.SH CUSTOMIZING HOST NAME LOOKUP
+.SH ENVIRONMENT
+.SS "CUSTOMIZING HOST NAME LOOKUP"
 In general, if the name supplied by the user does not have any dots
 in it, a default domain is appended to the end. This domain is usually
 defined in the \fB/etc/resolv.conf\fP file. If not, it is derived by
 taking the local hostname and taking everything after its first dot.
 .PP
+.fw LOCALDOMAIN
 The user can override this, and specify a different default domain,
 by defining it in the environment variable \fILOCALDOMAIN\fP.
 .PP
+.fw HOSTALIASES
 In addition, the user can supply his own single-word abbreviations
 for host names. They should be in a file consisting of one line per
 abbreviation. Each line contains an abbreviation, white space, and
 then the fully qualified host name. The name of this file must be
 specified in the environment variable \fIHOSTALIASES\fP.
-.SH SPECIAL CONSIDERATIONS
+.SH "SPECIAL CONSIDERATIONS"
 The complete set of resource record information for a domain name
 is available from an authoritative nameserver only. Therefore,
 if you query another server with the "-a" option, only a subset
@@ -769,13 +805,69 @@ Note that direct contact with such nameservers must be possible for
 this option to work.
 This option should be used with caution. Servers may be configured
 to refuse zone transfers if they are flooded with requests.
-.SH RELATED DOCUMENTATION
-rfc920, rfc952, rfc974, rfc1032, rfc1033, rfc1034, rfc1035,
-rfc1101, rfc1183, rfc1348, rfc1535, rfc1536, rfc1537, rfc1637,
-rfc1664, rfc1712
+.SH "RELATED DOCUMENTATION"
+rfc883, Domain names - implementation and specification
+.br
+rfc920, Domain requirements
+.br
+rfc952, DOD Internet host table specification
+.br
+rfc974, Mail routing and the domain system
+.br
+rfc1032, Domain administrators guide
+.br
+rfc1033, Domain administrators operations guide
+.br
+rfc1034, Domain names - concepts and facilities
+.br
+rfc1035, Domain names - implementation and specification
+.br
+rfc1101, DNS encoding of network names and other types
+.br
+rfc1123, Requirements for Internet hosts - application
+.br
+rfc1183, New DNS RR definitions
+.br
+rfc1348, DNS NSAP RRs
+.br
+rfc1535, A security problem and proposed correction
+.br
+rfc1536, Common DNS implementation errors
+.br
+rfc1537, Common DNS data file configuration errors
+.br
+rfc1591, Domain Name System structure and delegation
+.br
+rfc1637, DNS NSAP resource records
+.br
+rfc1664, Using DNS to distribute X.400 address mappings
+.br
+rfc1700, Assigned numbers
+.br
+rfc1706, DNS NSAP resource records
+.br
+rfc1712, DNS encoding of geographical location
+.br
+rfc1713, Tools for DNS debugging
+.br
+rfc1794, DNS support for load balancing
+.br
+rfc1876, Expressing location information in the DNS
+.br
+rfc1884, IP v6 addressing architecture
+.br
+rfc1886, DNS extensions to support IP v6
+.br
+rfc1912, Common DNS operational and configuration errors
+.br
+rfc1982, Serial number arithmetic
+.br
+rfc1995, Incremental zone transfer in DNS
+.br
+rfc1996, Prompt notification of zone changes
 .SH AUTHOR
 This program is originally from Rutgers University.
 .br
-Rewritten by Eric Wassenaar, Nikhef-H, <e07@nikhef.nl>
+Rewritten by Eric Wassenaar, NIKHEF, <e07@nikhef.nl>
 .SH "SEE ALSO"
 named(8), resolv.conf(5), resolver(3)
diff --git a/usr.sbin/named/man/hostname.7 b/usr.sbin/named/man/hostname.7
index f19d84b4de8..46e40bf5960 100644
--- a/usr.sbin/named/man/hostname.7
+++ b/usr.sbin/named/man/hostname.7
@@ -1,5 +1,4 @@
-.\"	$NetBSD: hostname.7,v 1.1 1996/02/02 15:27:32 mrg Exp $
-.\"
+.\"	$OpenBSD: hostname.7,v 1.2 1997/03/12 10:42:14 downsj Exp $
 .\" Copyright (c) 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -106,5 +105,5 @@ originally provided is attempted.
 .SH SEE ALSO
 .IR gethostbyname (3),
 .IR resolver (5),
-.IR mailaddr (7),
+.IR mailaddr (5),
 .IR named (8)
diff --git a/usr.sbin/named/man/mailaddr.7 b/usr.sbin/named/man/mailaddr.7
index 517e31fcfe4..45a0aaa151b 100644
--- a/usr.sbin/named/man/mailaddr.7
+++ b/usr.sbin/named/man/mailaddr.7
@@ -1,5 +1,4 @@
-.\"	$NetBSD: mailaddr.7,v 1.1 1996/02/02 15:27:34 mrg Exp $
-.\"
+.\"	$OpenBSD: mailaddr.7,v 1.2 1997/03/12 10:42:15 downsj Exp $
 .\" Copyright (c) 1983, 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/named/man/named-xfer.8 b/usr.sbin/named/man/named-xfer.8
index 7f94bcff120..de1cf30b686 100644
--- a/usr.sbin/named/man/named-xfer.8
+++ b/usr.sbin/named/man/named-xfer.8
@@ -1,5 +1,4 @@
-.\"	$NetBSD: named-xfer.8,v 1.1 1996/02/02 15:27:37 mrg Exp $
-.\"
+.\"	$OpenBSD: named-xfer.8,v 1.2 1997/03/12 10:42:15 downsj Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
diff --git a/usr.sbin/named/man/named.8 b/usr.sbin/named/man/named.8
index 297b8b8819e..e6b450fa09e 100644
--- a/usr.sbin/named/man/named.8
+++ b/usr.sbin/named/man/named.8
@@ -1,5 +1,4 @@
-.\"	$NetBSD: named.8,v 1.1 1996/02/02 15:27:39 mrg Exp $
-.\"
+.\"	$OpenBSD: named.8,v 1.2 1997/03/12 10:42:16 downsj Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
@@ -130,19 +129,23 @@ The following is a small example:
 ;
 directory	/usr/local/adm/named
 
-.ta \w'forwarders\ 'u +\w'6.32.128.IN-ADDR.ARPA\ 'u +\w'128.32.137.8 128.32.137.3\ 'u
+.ta \w'check-names\ 'u +\w'6.32.128.IN-ADDR.ARPA\ 'u +\w'128.32.137.8 128.32.137.3\ 'u
 ; type	domain	source host/file				backup file
 
-cache	.							root.cache
+cache	.	root.cache
 primary	Berkeley.EDU	berkeley.edu.zone
 primary	32.128.IN-ADDR.ARPA	ucbhosts.rev
 secondary	CC.Berkeley.EDU	128.32.137.8 128.32.137.3	cc.zone.bak
 secondary	6.32.128.IN-ADDR.ARPA	128.32.137.8 128.32.137.3	cc.rev.bak
-primary	0.0.127.IN-ADDR.ARPA					localhost.rev
+primary	0.0.127.IN-ADDR.ARPA	localhost.rev
 forwarders	10.0.0.78 10.2.0.78
 limit	transfers-in 10
 limit	datasize 64M
+limit	files 256
 options	forward-only query-log fake-iquery
+check-names	primary fail
+check-names	secondary warn
+check-names	response ignore
 
 .DT
 .fi
@@ -240,6 +243,10 @@ a warning message.
 which \s-1BIND\s+1 will spawn at any one time.
 \fBtransfers-per-ns\fP's argument is the maximum number of zone transfers to
 be simultaneously initiated to any given remote name server.
+\fBfiles\fP's argument sets the number of file descriptors available to
+the process. \fINote:\fP not all systems provide a call to implement
+this -- on such systems, the use of the \fBfiles\fP parameter of ``limit''
+will result in a warning message.
 .LP
 The ``options'' directive introduces a boolean specifier that changes the
 behaviour of \s-1BIND\s+1.  More than one option can be specified in a single
@@ -261,6 +268,18 @@ and \fBfake-iquery\fP, which tells \s-1BIND\s+1 to send back a useless and
 bogus reply to ``inverse queries'' rather than responding with an error --
 this is helpful if you have a lot of microcomputers or SunOS hosts or both.
 .LP
+The ``check-names'' directive tells \s-1BIND\s+1 to check names in either
+``primary'' or ``secondary'' zone files, or in messages (``response'')
+received during recursion (for example, those which would be forwarded back
+to a firewalled requestor).  For each type of name,
+\s-1BIND\s+1 can be told to ``fail'', such that a zone would not be loaded
+or a response would not be cached or forwarded, or merely ``warn'' which
+would cause a message to be emitted in the system operations logs, or to
+``ignore'' the badness of a name and process it in the traditional fashion.
+Names are considered good if they match RFC 952's expectations (if they are
+host names), or if they consist only of printable \s-1ASCII\s+1 characters
+(if they are not host names).
+.LP
 The ``max-fetch'' directive (not shown) is allowed for backward compatibility;
 its meaning is identical to ``limit transfers-in''.
 .PP
@@ -343,12 +362,13 @@ Each master zone file should begin with an SOA record for the zone.
 An example SOA record is as follows:
 .LP
 .nf
-@	IN	SOA	ucbvax.Berkeley.EDU. rwh.ucbvax.Berkeley.EDU. (
-				1989020501	; serial
-				10800	; refresh
-				3600	; retry
-				3600000	; expire
-				86400 )	; minimum
+@ IN SOA ucbvax.Berkeley.EDU. rwh.ucbvax.Berkeley.EDU. (
+.ta \w'x\ IN\ SOA\ 'u +\w'1989020501\ 'u
+	1989020501	; serial
+	10800	; refresh
+	3600	; retry
+	3600000	; expire
+	86400 )	; minimum
 .fi
 .LP
 The SOA specifies a serial number, which should be changed each time the
diff --git a/usr.sbin/named/man/named.reload.8 b/usr.sbin/named/man/named.reload.8
index 9e3a66cdcea..921a4d5c742 100644
--- a/usr.sbin/named/man/named.reload.8
+++ b/usr.sbin/named/man/named.reload.8
@@ -1,5 +1,4 @@
-.\"	$NetBSD: named.reload.8,v 1.1 1996/02/02 15:27:42 mrg Exp $
-.\"
+.\"	$OpenBSD: named.reload.8,v 1.2 1997/03/12 10:42:16 downsj Exp $
 .\" ++Copyright++ 1987, 1993
 .\" -
 .\" Copyright (c) 1987, 1993
diff --git a/usr.sbin/named/man/named.restart.8 b/usr.sbin/named/man/named.restart.8
index 3bcc4b3ee6c..ade45493188 100644
--- a/usr.sbin/named/man/named.restart.8
+++ b/usr.sbin/named/man/named.restart.8
@@ -1,5 +1,4 @@
-.\"	$NetBSD: named.restart.8,v 1.1 1996/02/02 15:27:45 mrg Exp $
-.\"
+.\"	$OpenBSD: named.restart.8,v 1.2 1997/03/12 10:42:17 downsj Exp $
 .\" ++Copyright++ 1987, 1993
 .\" -
 .\" Copyright (c) 1987, 1993
diff --git a/usr.sbin/named/man/ndc.8 b/usr.sbin/named/man/ndc.8
index f8799e169a5..df19cf117cb 100644
--- a/usr.sbin/named/man/ndc.8
+++ b/usr.sbin/named/man/ndc.8
@@ -1,5 +1,4 @@
-.\"	$NetBSD: ndc.8,v 1.1 1996/02/02 15:27:48 mrg Exp $
-.\"
+.\"	$OpenBSD: ndc.8,v 1.2 1997/03/12 10:42:17 downsj Exp $
 .\" Copyright (c) 1994
 .\"    The Regents of the University of California.  All rights reserved.
 .\" 
diff --git a/usr.sbin/named/man/nslookup.8 b/usr.sbin/named/man/nslookup.8
index ca8189d53ca..e49f050681b 100644
--- a/usr.sbin/named/man/nslookup.8
+++ b/usr.sbin/named/man/nslookup.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: nslookup.8,v 1.1 1996/02/02 15:27:51 mrg Exp $
+.\"	$OpenBSD: nslookup.8,v 1.2 1997/03/12 10:42:18 downsj Exp $
 .\"
 .\" ++Copyright++ 1985, 1989
 .\" -
diff --git a/usr.sbin/named/man/resolver.3 b/usr.sbin/named/man/resolver.3
index 6372823e11f..23297c5ee14 100644
--- a/usr.sbin/named/man/resolver.3
+++ b/usr.sbin/named/man/resolver.3
@@ -1,5 +1,4 @@
-.\"	$NetBSD: resolver.3,v 1.1 1996/02/02 15:27:53 mrg Exp $
-.\"
+.\"	$OpenBSD: resolver.3,v 1.2 1997/03/12 10:42:18 downsj Exp $
 .\" Copyright (c) 1985, 1995 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -18,7 +17,7 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.3	6.5 (Berkeley) 6/23/90
-.\"	$Id: resolver.3,v 8.3 1995/12/22 10:20:28 vixie Exp 
+.\"	$From: resolver.3,v 8.4 1996/05/09 05:59:10 vixie Exp $
 .\"
 .TH RESOLVER 3 "December 11, 1995
 .UC 4
@@ -100,6 +99,10 @@ res_query, res_search, res_mkquery, res_send, res_init, dn_comp, dn_expand \- re
 .B char *exp_dn;
 .br
 .B int  length;
+.PP
+.B herror(const char *s)
+.PP
+.B hstrerror(int err)
 .SH DESCRIPTION
 These routines are used for making, sending and interpreting
 query and reply messages with Internet domain name servers.
@@ -295,6 +298,38 @@ The uncompressed name is placed in the buffer indicated by
 which is of size
 .IR length .
 The size of compressed name is returned or \-1 if there was an error.
+.PP
+The external variable
+.B h_errno
+is set whenever an error occurs during resolver operation.  The following
+definitions are given in
+.BR <netdb.h> :
+.PP
+.nf
+#define NETDB_INTERNAL -1  /* see errno */
+#define NETDB_SUCCESS  0   /* no problem */
+#define HOST_NOT_FOUND 1   /* Authoritative Answer Host not found */
+#define TRY_AGAIN      2   /* Non-Authoritive not found, or SERVFAIL */
+#define NO_RECOVERY    3   /* Nonrecoverable: FORMERR, REFUSED, NOTIMP */
+#define NO_DATA        4   /* Valid name, no data for requested type */
+.ft R
+.ad
+.fi
+.PP
+The
+.B herror
+function writes a message to the diagnostic output consisting of the string
+parameter
+.BR s ,
+the constant string ": ", and a message corresponding to the value of
+.BR h_errno .
+.PP
+The
+.B hstrerror
+function returns a string which is the message text corresponding to the
+value of the
+.B err
+parameter.
 .SH FILES
 /etc/resolv.conf	see resolver(5)
 .SH "SEE ALSO"
diff --git a/usr.sbin/named/man/resolver.5 b/usr.sbin/named/man/resolver.5
index 20b54f57378..2691ce61f42 100644
--- a/usr.sbin/named/man/resolver.5
+++ b/usr.sbin/named/man/resolver.5
@@ -1,5 +1,4 @@
-.\"	$NetBSD: resolver.5,v 1.1 1996/02/02 15:27:55 mrg Exp $
-.\"
+.\"	$OpenBSD: resolver.5,v 1.2 1997/03/12 10:42:19 downsj Exp $
 .\" Copyright (c) 1986 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -16,9 +15,9 @@
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	@(#)resolver.5	5.9 (Berkeley) 12/14/89
-.\"	$Id: resolver.5,v 8.3 1995/12/06 20:34:35 vixie Exp 
+.\"	$From: resolver.5,v 8.3 1995/12/06 20:34:35 vixie Exp $
 .\"
-.TH RESOLVER 5 ""November 11, 1993""
+.TH RESOLVER 5 "November 11, 1993"
 .UC 4
 .SH NAME
 resolver \- resolver configuration file
@@ -130,6 +129,6 @@ the keyword, separated by white space.
 .SH FILES
 .I /etc/resolv.conf
 .SH SEE ALSO
-gethostbyname(3), resolver(3), hostname(7), named(8)
+gethostbyname(2), resolver(3), hostname(7), named(8)
 .br
 Name Server Operations Guide for BIND