Virgin import of BIND v8.2.3-REL

6 files changed, 23 insertions, 13 deletions

diff --git a/contrib/bind/include/Makefile b/contrib/bind/include/Makefile
index 168c0d2..6a61833 100644
--- a/contrib/bind/include/Makefile
+++ b/contrib/bind/include/Makefile
@@ -26,7 +26,7 @@ MARGS= DESTDIR="${DESTDIR}" DESTINC="${DESTINC}" INSTALL="${INSTALL}" \
 
 all depend clean distclean install::
 	@for x in ${SUBDIRS}; do \
-		(cd $$x; pwd; ${MAKE} ${MARGS} $@); \
+		(cd $$x; pwd; ${MAKE} ${MARGS} $@) || exit 1; \
 	done
 
 distclean:: clean
@@ -48,7 +48,7 @@ links:: FRC
 		( mkdir $$x; cd $$x; pwd; ln -s ../SRC/$$x SRC; \
 		  cp SRC/Makefile Makefile; chmod +w Makefile; \
 		  $(MAKE) $(MARGS) links; \
-		); \
+		) || exit 1; \
 	done
 
 FRC:
diff --git a/contrib/bind/include/arpa/nameser.h b/contrib/bind/include/arpa/nameser.h
index 3de42fd..3129a10 100644
--- a/contrib/bind/include/arpa/nameser.h
+++ b/contrib/bind/include/arpa/nameser.h
@@ -49,7 +49,7 @@
  */
 
 /*
- *	$Id: nameser.h,v 8.37 2000/03/30 21:16:49 vixie Exp $
+ *	$Id: nameser.h,v 8.41 2000/12/23 08:14:50 vixie Exp $
  */
 
 #ifndef _ARPA_NAMESER_H_
@@ -127,10 +127,7 @@ struct _ns_flagdata {  int mask, shift;  };
 extern struct _ns_flagdata _ns_flagdata[];
 
 /* Accessor macros - this is part of the public interface. */
-#define ns_msg_getflag(handle, flag) ( \
-			((handle)._flags & _ns_flagdata[flag].mask) \
-			 >> _ns_flagdata[flag].shift \
-			)
+
 #define ns_msg_id(handle) ((handle)._id + 0)
 #define ns_msg_base(handle) ((handle)._msg + 0)
 #define ns_msg_end(handle) ((handle)._eom + 0)
@@ -295,6 +292,7 @@ typedef enum __ns_type {
 	ns_t_dname = 39,	/* Non-terminal DNAME (for IPv6) */
 	ns_t_sink = 40,		/* Kitchen sink (experimentatl) */
 	ns_t_opt = 41,		/* EDNS0 option (meta-RR) */
+	ns_t_tkey = 249,	/* Transaction key */
 	ns_t_tsig = 250,	/* Transaction signature. */
 	ns_t_ixfr = 251,	/* Incremental zone transfer. */
 	ns_t_axfr = 252,	/* Transfer zone of authority. */
@@ -469,6 +467,7 @@ typedef enum __ns_cert_types {
 /*
  * ANSI C identifier hiding for bind's lib/nameser.
  */
+#define	ns_msg_getflag		__ns_msg_getflag
 #define ns_get16		__ns_get16
 #define ns_get32		__ns_get32
 #define ns_put16		__ns_put16
@@ -503,6 +502,7 @@ typedef enum __ns_cert_types {
 #define	ns_samename		__ns_samename
 
 __BEGIN_DECLS
+int		ns_msg_getflag __P((ns_msg, int));
 u_int		ns_get16 __P((const u_char *));
 u_long		ns_get32 __P((const u_char *));
 void		ns_put16 __P((u_int, u_char *));
diff --git a/contrib/bind/include/irs.h b/contrib/bind/include/irs.h
index 17d3f20..2cb3a1b 100644
--- a/contrib/bind/include/irs.h
+++ b/contrib/bind/include/irs.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: irs.h,v 8.4 1999/01/18 07:46:46 vixie Exp $
+ * $Id: irs.h,v 8.5 2000/12/23 08:14:49 vixie Exp $
  */
 
 #ifndef _IRS_H_INCLUDED
@@ -207,6 +207,8 @@ extern struct irs_acc *	irs_dns_acc __P((const char *options));
 extern struct irs_acc *	irs_nis_acc __P((const char *options));
 extern struct irs_acc *	irs_irp_acc __P((const char *options));
 
+extern void		irs_destroy(void);
+
 /*
  * These forward declarations are for the semi-private functions in
  * the get*.c files. Each of these funcs implements the real get*
diff --git a/contrib/bind/include/isc/list.h b/contrib/bind/include/isc/list.h
index febfbf8..21dd565 100644
--- a/contrib/bind/include/isc/list.h
+++ b/contrib/bind/include/isc/list.h
@@ -17,6 +17,7 @@
 
 #ifndef LIST_H
 #define LIST_H 1
+#include <isc/assertions.h>
 
 #define LIST(type) struct { type *head, *tail; }
 #define INIT_LIST(list) \
@@ -28,7 +29,7 @@
 		(elt)->link.prev = (void *)(-1); \
 		(elt)->link.next = (void *)(-1); \
 	} while (0)
-#define LINKED(elt, link) ((elt)->link.prev != (void *)(-1))
+#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
 
 #define HEAD(list) ((list).head)
 #define TAIL(list) ((list).tail)
@@ -36,6 +37,7 @@
 
 #define PREPEND(list, elt, link) \
 	do { \
+		INSIST(!LINKED(elt, link));\
 		if ((list).head != NULL) \
 			(list).head->link.prev = (elt); \
 		else \
@@ -47,6 +49,7 @@
 
 #define APPEND(list, elt, link) \
 	do { \
+		INSIST(!LINKED(elt, link));\
 		if ((list).tail != NULL) \
 			(list).tail->link.next = (elt); \
 		else \
@@ -58,6 +61,7 @@
 
 #define UNLINK(list, elt, link) \
 	do { \
+		INSIST(LINKED(elt, link));\
 		if ((elt)->link.next != NULL) \
 			(elt)->link.next->link.prev = (elt)->link.prev; \
 		else \
@@ -74,6 +78,7 @@
 
 #define INSERT_BEFORE(list, before, elt, link) \
 	do { \
+		INSIST(!LINKED(elt, link));\
 		if ((before)->link.prev == NULL) \
 			PREPEND(list, elt, link); \
 		else { \
@@ -86,6 +91,7 @@
 
 #define INSERT_AFTER(list, after, elt, link) \
 	do { \
+		INSIST(!LINKED(elt, link));\
 		if ((after)->link.next == NULL) \
 			APPEND(list, elt, link); \
 		else { \
diff --git a/contrib/bind/include/isc/misc.h b/contrib/bind/include/isc/misc.h
index d13e1d3..3a94d3f 100644
--- a/contrib/bind/include/isc/misc.h
+++ b/contrib/bind/include/isc/misc.h
@@ -16,14 +16,16 @@
  */
 
 /*
- * $Id: misc.h,v 8.2 1999/01/08 19:23:10 vixie Exp $
+ * $Id: misc.h,v 8.4 2000/12/23 08:14:52 vixie Exp $
  */
 
 #ifndef _ISC_MISC_H
 #define _ISC_MISC_H
 
 #define	bitncmp		__bitncmp
+/*#define isc_movefile	__isc_movefile */
 
 extern int		bitncmp(const void *l, const void *r, int n);
+extern int		isc_movefile(const char *, const char *);
 
 #endif /*_ISC_MISC_H*/
diff --git a/contrib/bind/include/resolv.h b/contrib/bind/include/resolv.h
index 414fe08..600e98b 100644
--- a/contrib/bind/include/resolv.h
+++ b/contrib/bind/include/resolv.h
@@ -50,7 +50,7 @@
 
 /*
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
+ *	$Id: resolv.h,v 8.32 2000/12/23 08:14:49 vixie Exp $
  */
 
 #ifndef _RESOLV_H_
@@ -328,7 +328,7 @@ extern const struct res_sym __p_rcode_syms[];
 #define res_nclose		__res_nclose
 #define res_ninit		__res_ninit
 #define res_nmkquery		__res_nmkquery
-#define res_npquery		__res_npquery
+#define res_pquery		__res_pquery
 #define res_nquery		__res_nquery
 #define res_nquerydomain	__res_nquerydomain
 #define res_nsearch		__res_nsearch
@@ -383,7 +383,7 @@ int		res_ninit __P((res_state));
 int		res_nisourserver __P((const res_state,
 				      const struct sockaddr_in *));
 void		fp_resstat __P((const res_state, FILE *));
-void		res_npquery __P((const res_state, const u_char *, int, FILE *));
+void		res_pquery __P((const res_state, const u_char *, int, FILE *));
 const char *	res_hostalias __P((const res_state, const char *,
 				   char *, size_t));
 int		res_nquery __P((res_state,