Import tools from bind-4.9.3-beta26 (update beta24)

6 files changed, 387 insertions, 12 deletions

diff --git a/usr.bin/dig/dig.1 b/usr.bin/dig/dig.1
index 3f97311..b94957a 100644
--- a/usr.bin/dig/dig.1
+++ b/usr.bin/dig/dig.1
@@ -1,4 +1,4 @@
-.\" $Id: dig.1,v 4.9.1.2 1993/09/08 00:00:49 vixie Exp $
+.\" $Id: dig.1,v 8.1 1994/12/15 06:24:10 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -61,7 +61,7 @@
 .\" Man page reformatted for this release by Andrew Cherenson
 .\" (arc@sgi.com)
 .\"
-.TH DIG @CMD_EXT_U@ "August 30, 1990"
+.TH DIG 1 "August 30, 1990"
 .SH NAME
 dig \- send domain name query packets to name servers
 .SH SYNOPSIS
@@ -99,7 +99,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 (@FORMAT_EXT@)
+.IR resolver (5)
 for information on /etc/resolv.conf.
 (WARNING: Changing /etc/resolv.conf will affect
 the standard  resolver library and  potentially several
@@ -188,7 +188,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 (@SYS_OPS_EXT@)
+.IR ping (8)
 command
 for response time comparison. This rather
 unelegantly makes a call to the shell. The last
@@ -258,7 +258,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 (@SYS_OPS_EXT@).
+.IR nslookup (8).
 If an option requires a parameter, the form is as
 follows:
 .sp 1
@@ -324,7 +324,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 (@LIB_NETWORK_EXT@)
+.IR resolver (3)
 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
@@ -345,7 +345,7 @@ Steve Hotz
 hotz@isi.edu
 .SH ACKNOWLEDGMENTS
 \fIDig\fP uses functions from 
-.IR nslookup (@SYS_OPS_EXT@)
+.IR nslookup (8)
 authored by Andrew Cherenson.
 .SH BUGS
 \fIDig\fP has a serious case of "creeping featurism" -- the result of
@@ -361,4 +361,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
-@INDOT@named(@SYS_OPS_EXT@),  resolver(@LIB_NETWORK_EXT@),  resolver(@FORMAT_EXT@),  nslookup(@SYS_OPS_EXT@)
+named(8),  resolver(3),  resolver(5),  nslookup(8)
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
new file mode 100644
index 0000000..5f4fb97
--- /dev/null
+++ b/usr.bin/dnsquery/Makefile
@@ -0,0 +1,6 @@
+# $Id$
+
+PROG=	dnsquery
+MAN1=	dnsquery.1
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/dnsquery/dnsquery.1 b/usr.bin/dnsquery/dnsquery.1
new file mode 100644
index 0000000..ff147f0
--- /dev/null
+++ b/usr.bin/dnsquery/dnsquery.1
@@ -0,0 +1,164 @@
+.TH DNSQUERY 1 "10 March 1990"
+.UC 6
+.SH NAME
+dnsquery \- query domain name servers using resolver
+.SH SYNOPSIS
+.B dnsquery
+[-n
+.I nameserver]
+[-t
+.I type]
+[-c
+.I class]
+[-r 
+.I retry] 
+[-p 
+.I retry period] 
+[-d] [-s] [-v] host
+.SH DESCRIPTION
+The
+.IR dnsquery
+program is a general interface to nameservers via
+BIND resolver library calls.  The program supports
+queries to the nameserver with an opcode of QUERY.
+This program is intended to be a replacement or
+supplement to programs like nstest, nsquery and
+nslookup.  All arguments except for
+.IR host
+and
+.IR ns
+are treated without case-sensitivity.
+.SH OPTIONS
+.TP 1i
+.B \-n
+The nameserver to be used in the query.  Nameservers can appear as either 
+Internet addresses of the form w.x.y.z or can appear as domain names.  
+(default: as specified in /etc/resolv.conf)
+.TP 1i
+.B \-t
+The type of resource record of interest.  Types include:
+.RS 1.5i
+.TP 1i
+A
+address
+.PD 0
+.TP 1i
+NS
+nameserver
+.TP 1i
+CNAME
+canonical name
+.TP 1i
+PTR	
+domain name pointer
+.TP 1i
+SOA	
+start of authority
+.TP 1i
+WKS	
+well-known service
+.TP 1i
+HINFO
+host information
+.TP 1i
+MINFO
+mailbox information
+.TP 1i
+MX	
+mail exchange
+.TP 1i
+RP	
+responsible person
+.TP 1i
+MG	
+mail group member
+.TP 1i
+AFSDB	
+DCE or AFS server
+.TP 1i
+ANY	
+wildcard
+.RE
+.PD
+.IP
+Note that any case may be used.  (default:  ANY)
+.TP 1i
+.B \-c
+The class of resource records of interest.
+Classes include:
+.RS 2i
+.TP 1i
+IN	
+Internet
+.PD 0
+.TP 1i
+HS	
+Hesiod
+.TP 1i
+CHAOS
+Chaos
+.TP 1i
+ANY	
+wildcard
+.RE
+.PD
+.IP
+Note that any case may be used.  (default:  IN)
+.TP 1i
+.B \-r
+The number of times to retry if the nameserver is
+not responding.  (default:  4)
+.TP 1i
+.B \-p
+Period to wait before timing out.  (default:  RES_TIMEOUT)
+.IR options
+field.  (default:  any answer)
+.TP 1i
+.B \-d
+Turn on debugging.  This sets the RES_DEBUG bit of the resolver's
+.IR options
+field.  (default:  no debugging)
+.TP 1i
+.B \-s
+Use a
+.IR stream
+rather than a packet.  This uses a TCP stream connection with
+the nameserver rather than a UDP datagram.  This sets the
+RES_USEVC bit of the resolver's
+.IR options
+field.  (default:  UDP)
+.TP 1i
+.B \-v
+Synonym for the 's' flag.
+.TP 1i
+.B host
+The name of the host (or domain) of interest.
+.SH FILES
+/etc/resolv.conf 	to get the default ns and search lists
+.br
+<arpa/nameser.h> 	list of usable RR types and classes
+.br
+<resolv.h>		list of resolver flags
+.SH "SEE ALSO"
+nslookup(8), nstest(1), nsquery(1), 
+named(8), resolver(5)
+.SH DIAGNOSTICS
+If the resolver fails to answer the query and debugging has not been
+turned on,
+.IR dnsquery
+will simply print a message like:
+.TP 1i
+Query failed (rc = 1) : Unknown host
+.LP
+The value of the return code is supplied by h_errno.
+.SH BUGS
+Queries of a class other than IN can have interesting results
+since ordinarily a nameserver only has a list of root nameservers
+for class IN resource records.
+.PP
+Query uses a call to inet_addr() to determine if the argument
+for the '-n' option is a valid Internet address.  Unfortunately,
+inet_addr() seems to cause a segmentation fault with some (bad)
+addresses (e.g. 1.2.3.4.5).
+.SH AUTHOR
+Bryan Beecher
diff --git a/usr.bin/dnsquery/dnsquery.c b/usr.bin/dnsquery/dnsquery.c
new file mode 100644
index 0000000..d28f929
--- /dev/null
+++ b/usr.bin/dnsquery/dnsquery.c
@@ -0,0 +1,202 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <netdb.h>
+#include <resolv.h>
+#include <errno.h>
+
+#include "../conf/portability.h"
+
+extern int errno;
+extern int h_errno;
+extern char *h_errlist[];
+
+main(argc, argv)
+int argc;
+char *argv[];
+{
+	char name[MAXDNAME];
+	u_char answer[8*1024];
+	register int c, i = 0;
+	unsigned long ul;
+	int nameservers = 0, class, type, len;
+	struct in_addr q_nsaddr[MAXNS];
+	struct hostent *q_nsname;
+	extern int optind, opterr;
+	extern char *optarg;
+	HEADER *hp;
+	int stream = 0, debug = 0;
+
+	/* set defaults */
+	len = MAXDNAME;
+	gethostname(name, len);
+	class = C_IN;
+	type = T_ANY;
+
+	/* if no args, exit */
+	if (argc == 1) {
+		fprintf(stderr, "Usage:  %s [-h] host [-n ns] [-t type] [-c class] [-r retry] [-p period] [-s] [-v] [-d] [-a]\n", argv[0]);
+		exit(-1);
+	}
+
+	/* handle args */
+	while ((c = getopt(argc, argv, "c:dh:n:p:r:st:u:v")) != EOF) {
+		switch (c) {
+
+		case 'r' :	_res.retry = atoi(optarg);
+				break;
+
+		case 'p' :	_res.retrans = atoi(optarg);
+				break;
+
+		case 'h' :	strcpy(name, optarg);
+				break;
+
+		case 'c' :	if (!strcasecmp(optarg, "IN"))
+					class = C_IN;
+				else if (!strcasecmp(optarg, "HS"))
+					class = C_HS;
+				else if (!strcasecmp(optarg, "CHAOS"))
+					class = C_CHAOS;
+				else if (!strcasecmp(optarg, "ANY"))
+					class = C_ANY;
+				else {
+					class = T_ANY;
+					fprintf(stderr, "optarg=%s\n", optarg);
+				}
+				break;
+
+		case 't' :	if (!strcasecmp(optarg, "A"))
+					type = T_A;
+				else if (!strcasecmp(optarg, "NS"))
+					type = T_NS;
+				else if (!strcasecmp(optarg, "CNAME"))
+					type = T_CNAME;
+				else if (!strcasecmp(optarg, "SOA"))
+					type = T_SOA;
+				else if (!strcasecmp(optarg, "WKS"))
+					type = T_WKS;
+				else if (!strcasecmp(optarg, "PTR"))
+					type = T_PTR;
+				else if (!strcasecmp(optarg, "HINFO"))
+					type = T_HINFO;
+				else if (!strcasecmp(optarg, "MINFO"))
+					type = T_MINFO;
+				else if (!strcasecmp(optarg, "MX"))
+					type = T_MX;
+				else if (!strcasecmp(optarg, "MG"))
+					type = T_MG;
+				else if (!strcasecmp(optarg, "RP"))
+					type = T_RP;
+				else if (!strcasecmp(optarg, "TXT"))
+					type = T_TXT;
+				else if (!strcasecmp(optarg, "AFSDB"))
+					type = T_AFSDB;
+				else if (!strcasecmp(optarg, "ANY"))
+					type = T_ANY;
+				else {
+					fprintf(stderr, "Bad type (%s)\n", optarg);
+					exit(-1);
+				}
+				break;
+
+		case 'd' :	debug++;
+				break;
+
+		case 's' :	
+		case 'v' :	stream++;
+				break;
+
+		case 'n' :	
+				/*
+				 *  If we set some nameservers here without
+				 *  using gethostbyname() first, then they will
+				 *  get overwritten when we do the first query.
+				 *  So, we must init the resolver before any 
+				 *  of this.
+				 */
+				if (!(_res.options & RES_INIT))
+					if (res_init() == -1) {
+						fprintf(stderr,
+							"res_init() failed\n");
+						exit(-1);
+				}
+				if (nameservers >= MAXNS) break;
+				(void) inet_aton(optarg,
+						 &q_nsaddr[nameservers]);
+				if (!inet_aton(optarg, &ul)) {
+					q_nsname = gethostbyname(optarg);
+					if (q_nsname == 0) {
+						fprintf(stderr,
+						       "Bad nameserver (%s)\n",
+							optarg);
+						exit(-1);
+					}
+					bcopy((char *) q_nsname->h_addr,
+					      (char *) &q_nsaddr[nameservers],
+					      INADDRSZ);
+				}
+				else
+					q_nsaddr[nameservers].s_addr = ul;
+				nameservers++;
+				break;
+
+		default : 	fprintf(stderr, 
+				"\tUsage:  %s [-n ns] [-h host] [-t type] [-c class] [-r retry] [-p period] [-s] [-v] [-d] [-a]\n", argv[0]);
+				exit(-1);
+		}
+	}
+	if (optind < argc)
+		strcpy(name, argv[optind]);
+
+	len = sizeof(answer);
+
+	/* 
+	 * set these here so they aren't set for a possible call to
+	 * gethostbyname above
+	*/
+	if (debug) 
+		_res.options |= RES_DEBUG;
+	if (stream)
+		 _res.options |= RES_USEVC;
+
+	/* if the -n flag was used, add them to the resolver's list */
+	if (nameservers != 0) {
+		_res.nscount = nameservers;
+		for (i = nameservers - 1; i >= 0; i--) {
+			_res.nsaddr_list[i].sin_addr.s_addr = q_nsaddr[i].s_addr;
+			_res.nsaddr_list[i].sin_family = AF_INET;
+			_res.nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
+		}
+	}
+
+	/*
+	 * if the -h arg is fully-qualified, use res_query() since
+	 * using res_search() will lead to use of res_querydomain()
+	 * which will strip the trailing dot
+	 */
+	if (name[strlen(name) - 1] == '.') {
+		if (res_query(name, class, type, answer, len) < 0) {
+			hp = (HEADER *) answer;
+			if ((hp->rcode == 0) && (hp->ancount > 0))
+				__p_query(answer);
+			else
+				fprintf(stderr, "Query failed (h_errno = %d) : %s\n", 
+						h_errno, h_errlist[h_errno]);
+			exit(-1);
+		}
+	}
+	else if (res_search(name, class, type, answer, len) < 0) {
+		hp = (HEADER *) answer;
+		if ((hp->rcode == 0) && (hp->ancount > 0))
+			__p_query(answer);
+		else
+			fprintf(stderr, "Query failed (h_errno = %d) : %s\n", 
+						h_errno, h_errlist[h_errno]);
+		exit(-1);
+	}
+	__p_query(answer);
+	exit(0);
+}
diff --git a/usr.bin/host/host.1 b/usr.bin/host/host.1
index 2f20c55..9e1827d 100644
--- a/usr.bin/host/host.1
+++ b/usr.bin/host/host.1
@@ -50,8 +50,8 @@
 .\" SOFTWARE.
 .\" -
 .\" --Copyright--
-.\" $Id: host.1,v 4.9.1.3 1994/06/02 17:14:38 vixie Exp $
-.TH HOST @CMD_EXT_U@
+.\" $Id: host.1,v 8.1 1994/12/15 06:24:10 vixie Exp $
+.TH HOST 1
 .SH NAME
 host \- look up host names using domain server
 .SH SYNOPSIS 
@@ -190,7 +190,7 @@ host name.  This file must be pointed to by an environment variable
 .IR HOSTALIASES ,
 which is the name of the file.
 .SH "See Also"
-@INDOT@named (@SYS_OPS_EXT@)
+named (8)
 .SH BUGS
 Unexpected effects can happen when you type a name that is not
 part of the local domain.  Please always keep in mind the
diff --git a/usr.bin/host/host.c b/usr.bin/host/host.c
index 9efb95b..ec79455 100644
--- a/usr.bin/host/host.c
+++ b/usr.bin/host/host.c
@@ -67,7 +67,7 @@ char copyright[] =
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: host.c,v 8.5 1995/06/29 09:26:32 vixie Exp $";
+static char rcsid[] = "$Id: host.c,v 8.7 1995/08/22 05:01:49 vixie Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -125,6 +125,7 @@ char *pr_class(), *pr_rr(), *pr_type();
 extern char *hostalias();
 
 main(c, v)
+	int c;
 	char **v;
 {
 	unsigned addr;
@@ -242,6 +243,7 @@ main(c, v)
 		  printf("Too many cnames.  Possible loop.\n");
 		  exit(1);
 		}
+		strcat(cname, ".");
 		oldcname = cname;
 		hp = NULL;
 		h_errno = TRY_AGAIN;
@@ -539,6 +541,7 @@ getdomaininfo(name, domain)
 
 getinfo(name, domain, type)
 	char *name, *domain;
+	int type;
 {
 
 	HEADER *hp;