Update the resolver include files to bind-4.9.3-beta24 level (from beta9p1)

Note: this was done by selective patching from diffs by hand, in order
to not conflict with the 4.4BSD base code.  Beta9 was done the same way.

Obtained from:	Paul Vixie <paul@vix.com>

3 files changed, 59 insertions, 37 deletions

diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index eea3927..4035304 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -55,8 +55,8 @@
  *	From Id: nameser.h,v 4.9.1.15 1994/07/19 22:51:24 vixie Exp
  */
 
-#ifndef _NAMESER_H_
-#define	_NAMESER_H_
+#ifndef _ARPA_NAMESER_H_
+#define	_ARPA_NAMESER_H_
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -72,7 +72,7 @@
  * is new enough to contain a certain feature.
  */
 
-#define	__BIND		19940417	/* interface version stamp */
+#define	__BIND		19950621	/* interface version stamp */
 
 /*
  * Define constants based on rfc883
@@ -94,24 +94,26 @@
 #define	NAMESERVER_PORT	53
 
 /*
- * Currently define	d opcodes
+ * Currently defined opcodes
  */
 #define	QUERY		0x0		/* standard query */
 #define	IQUERY		0x1		/* inverse query */
 #define	STATUS		0x2		/* nameserver status query */
-			/* 0x3		   reserved */
+/*#define xxx		0x3 */		/* 0x3 reserved */
+#define	NS_NOTIFY_OP	0x4		/* notify secondary of SOA change */
+#ifdef ALLOW_UPDATES
 	/* non standard - supports ALLOW_UPDATES stuff from Mike Schwartz */
-#define	UPDATEA		0x9		/* add resource record */
-#define	UPDATED		0xa		/* delete a specific resource record */
-#define	UPDATEDA	0xb		/* delete all named resource record */
-#define	UPDATEM		0xc		/* modify a specific resource record */
-#define	UPDATEMA	0xd		/* modify all named resource record */
-
-#define	ZONEINIT	0xe		/* initial zone transfer */
-#define	ZONEREF		0xf		/* incremental zone referesh */
+# define UPDATEA	0x9		/* add resource record */
+# define UPDATED	0xa		/* delete a specific resource record */
+# define UPDATEDA	0xb		/* delete all named resource record */
+# define UPDATEM	0xc		/* modify a specific resource record */
+# define UPDATEMA	0xd		/* modify all named resource record */
+# define ZONEINIT	0xe		/* initial zone transfer */
+# define ZONEREF	0xf		/* incremental zone referesh */
+#endif
 
 /*
- * Currently define	d response codes
+ * Currently defined response codes
  */
 #define	NOERROR		0		/* no error */
 #define	FORMERR		1		/* format error */
@@ -119,8 +121,10 @@
 #define	NXDOMAIN	3		/* non existent domain */
 #define	NOTIMP		4		/* not implemented */
 #define	REFUSED		5		/* query refused */
+#ifdef ALLOW_UPDATES
 	/* non standard */
-#define	NOCHANGE	0xf		/* update failed to change db */
+# define NOCHANGE	0xf		/* update failed to change db */
+#endif
 
 /*
  * Type values for resources and queries
@@ -129,7 +133,7 @@
 #define	T_NS		2		/* authoritative server */
 #define	T_MD		3		/* mail destination */
 #define	T_MF		4		/* mail forwarder */
-#define	T_CNAME		5		/* connonical name */
+#define T_CNAME		5		/* canonical name */
 #define	T_SOA		6		/* start of authority zone */
 #define	T_MB		7		/* mailbox domain name */
 #define	T_MG		8		/* mail group member */
@@ -148,12 +152,17 @@
 #define	T_RT		21		/* router */
 #define	T_NSAP		22		/* NSAP address */
 #define	T_NSAP_PTR	23		/* reverse NSAP lookup (deprecated) */
+#define	T_SIG		24		/* security signature */
+#define	T_KEY		25		/* security key */
+#define	T_PX		26		/* X.400 mail mapping */
+#define	T_GPOS		27		/* geographical position (withdrawn) */
+#define	T_AAAA		28		/* IP6 Address */
+#define	T_LOC		29		/* Location Information */
 	/* non standard */
 #define	T_UINFO		100		/* user (finger) information */
 #define	T_UID		101		/* user ID */
 #define	T_GID		102		/* group ID */
 #define	T_UNSPEC	103		/* Unspecified format (binary data) */
-#define	T_SA		200		/* shuffle address */
 	/* Query type values which do not appear in resource records */
 #define	T_AXFR		252		/* transfer zone of authority */
 #define	T_MAILB		253		/* transfer mailbox records */
@@ -197,8 +206,7 @@ typedef struct {
 	unsigned	rd: 1;		/* recursion desired */
 			/* fields in fourth byte */
 	unsigned	ra: 1;		/* recursion available */
-	unsigned	pr: 1;		/* primary server req'd (!standard) */
-	unsigned	unused :2;	/* unused bits (MBZ as of 4.9.3a3) */
+	unsigned	unused :3;	/* unused bits (MBZ as of 4.9.3a3) */
 	unsigned	rcode :4;	/* response code */
 #endif
 #if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
@@ -210,8 +218,7 @@ typedef struct {
 	unsigned	qr :1;		/* response flag */
 			/* fields in fourth byte */
 	unsigned	rcode :4;	/* response code */
-	unsigned	unused :2;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	pr :1;		/* primary server req'd (!standard) */
+	unsigned	unused :3;	/* unused bits (MBZ as of 4.9.3a3) */
 	unsigned	ra :1;		/* recursion available */
 #endif
 			/* remaining bytes */
@@ -283,4 +290,4 @@ extern	u_int32_t	_getlong __P((const u_char *));
 	(cp) += INT32SZ; \
 }
 
-#endif /* !_NAMESER_H_ */
+#endif /* !_ARPA_NAMESER_H_ */
diff --git a/include/netdb.h b/include/netdb.h
index 1be7163..3fd20df 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *	$Id: netdb.h,v 1.1.1.1 1994/05/24 09:57:18 rgrimes Exp $
+ *	$Id: netdb.h,v 1.2 1995/05/30 04:54:41 rgrimes Exp $
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
  *
@@ -63,6 +63,8 @@
 #define	_PATH_PROTOCOLS	"/etc/protocols"
 #define	_PATH_SERVICES	"/etc/services"
 
+extern int h_errno;
+
 /*
  * Structures returned by network data base library.  All addresses are
  * supplied in host order, and returned in network order (suitable for
@@ -106,6 +108,8 @@ struct	protoent {
  * (left in extern int h_errno).
  */
 
+#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 Host not found, or SERVERFAIL */
 #define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
@@ -132,7 +136,7 @@ struct servent	*getservbyname __P((const char *, const char *));
 struct servent	*getservbyport __P((int, const char *));
 struct servent	*getservent __P((void));
 void		herror __P((const char *));
-char		*hstrerror __P((int));
+const char	*hstrerror __P((int));
 void		sethostent __P((int));
 /* void		sethostfile __P((const char *)); */
 void		setnetent __P((int));
diff --git a/include/resolv.h b/include/resolv.h
index e1c57f1..fe77da2 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -53,7 +53,7 @@
  *
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp
- *	$Id: resolv.h,v 1.2 1994/09/25 02:11:32 pst Exp $
+ *	$Id: resolv.h,v 1.3 1995/05/30 04:54:44 rgrimes Exp $
  */
 
 #ifndef _RESOLV_H_
@@ -72,7 +72,7 @@
  * is new enough to contain a certain feature.
  */
 
-#define	__RES	19940415
+#define	__RES	19950621
 
 /*
  * Resolver configuration file.
@@ -120,20 +120,21 @@ struct __res_state {
 /*
  * Resolver options (keep these in synch with res_debug.c, please)
  */
-#define	RES_INIT	0x00000001	/* address initialized */
-#define	RES_DEBUG	0x00000002	/* print debug messages */
-#define	RES_AAONLY	0x00000004	/* authoritative answers only */
-#define	RES_USEVC	0x00000008	/* use virtual circuit */
-#define	RES_PRIMARY	0x00000010	/* query primary server only */
-#define	RES_IGNTC	0x00000020	/* ignore trucation errors */
-#define	RES_RECURSE	0x00000040	/* recursion desired */
-#define	RES_DEFNAMES	0x00000080	/* use default domain name */
-#define	RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-#define	RES_DNSRCH	0x00000200	/* search up local domain tree */
+#define RES_INIT	0x00000001	/* address initialized */
+#define RES_DEBUG	0x00000002	/* print debug messages */
+#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
+#define RES_USEVC	0x00000008	/* use virtual circuit */
+#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
+#define RES_IGNTC	0x00000020	/* ignore trucation errors */
+#define RES_RECURSE	0x00000040	/* recursion desired */
+#define RES_DEFNAMES	0x00000080	/* use default domain name */
+#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
+#define RES_DNSRCH	0x00000200	/* search up local domain tree */
 #define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
 #define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
+#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
 
-#define	RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
+#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
 
 /*
  * Resolver "pfcode" values.  Used by dig.
@@ -190,6 +191,10 @@ extern struct __res_state _res;
 #define	p_fqname	__p_fqname
 #define	p_rr		__p_rr
 #define	p_option	__p_option
+#define	res_randomid	__res_randomid
+#define	res_isourserver	__res_isourserver
+#define	res_nameinquery	__res_nameinquery
+#define	res_queriesmatch __res_queriesmatch
 
 __BEGIN_DECLS
 int	 __dn_skipname __P((const u_char *, const u_char *));
@@ -212,6 +217,7 @@ int	 dn_comp __P((const char *, u_char *, int, u_char **, u_char **));
 int	 dn_expand __P((const u_char *, const u_char *, const u_char *,
 			char *, int));
 int	 res_init __P((void));
+u_int16_t res_randomid __P((void));
 int	 res_query __P((const char *, int, int, u_char *, int));
 int	 res_search __P((const char *, int, int, u_char *, int));
 int	 res_querydomain __P((const char *, const char *, int, int,
@@ -219,6 +225,11 @@ int	 res_querydomain __P((const char *, const char *, int, int,
 int	 res_mkquery __P((int, const char *, int, int, const u_char *, int,
 			  const u_char *, u_char *, int));
 int	 res_send __P((const u_char *, int, u_char *, int));
+int	 res_isourserver __P((const struct sockaddr_in *));
+int	 res_nameinquery __P((const char *, int, int,
+			      const u_char *, const u_char *));
+int	 res_queriesmatch __P((const u_char *, const u_char *,
+			       const u_char *, const u_char *));
 __END_DECLS
 
 #endif /* !_RESOLV_H_ */