Virgin import of BIND v8.2.3-T5B

3 files changed, 21 insertions, 4 deletions

diff --git a/contrib/bind/include/arpa/nameser.h b/contrib/bind/include/arpa/nameser.h
index c61f8b7..3de42fd 100644
--- a/contrib/bind/include/arpa/nameser.h
+++ b/contrib/bind/include/arpa/nameser.h
@@ -49,7 +49,7 @@
  */
 
 /*
- *	$Id: nameser.h,v 8.36 1999/10/15 19:49:08 vixie Exp $
+ *	$Id: nameser.h,v 8.37 2000/03/30 21:16:49 vixie Exp $
  */
 
 #ifndef _ARPA_NAMESER_H_
@@ -489,6 +489,7 @@ typedef enum __ns_cert_types {
 #define	ns_name_compress	__ns_name_compress
 #define	ns_name_uncompress	__ns_name_uncompress
 #define	ns_name_skip		__ns_name_skip
+#define	ns_name_rollback	__ns_name_rollback
 #define	ns_sign			__ns_sign
 #define	ns_sign_tcp		__ns_sign_tcp
 #define	ns_sign_tcp_init	__ns_sign_tcp_init
@@ -530,6 +531,8 @@ int		ns_name_uncompress __P((const u_char *, const u_char *,
 int		ns_name_compress __P((const char *, u_char *, size_t,
 				      const u_char **, const u_char **));
 int		ns_name_skip __P((const u_char **, const u_char *));
+void		ns_name_rollback __P((const u_char *, const u_char **,
+				      const u_char **));
 int		ns_sign __P((u_char *, int *, int, int, void *,
 			     const u_char *, int, u_char *, int *, time_t));
 int		ns_sign_tcp __P((u_char *, int *, int, int,
diff --git a/contrib/bind/include/isc/logging.h b/contrib/bind/include/isc/logging.h
index 720e2a31..3d3d313 100644
--- a/contrib/bind/include/isc/logging.h
+++ b/contrib/bind/include/isc/logging.h
@@ -18,8 +18,10 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <unistd.h>
 
 #define log_critical		(-5)
 #define log_error   		(-4)
@@ -64,6 +66,7 @@ typedef struct log_channel *log_channel;
 #define log_category_is_active	__log_category_is_active
 #define log_new_syslog_channel	__log_new_syslog_channel
 #define log_new_file_channel	__log_new_file_channel
+#define log_set_file_owner	__log_set_file_owner
 #define log_new_null_channel	__log_new_null_channel
 #define log_inc_references	__log_inc_references
 #define log_dec_references	__log_dec_references
@@ -89,6 +92,7 @@ log_channel		log_new_syslog_channel(unsigned int, int, int);
 log_channel		log_new_file_channel(unsigned int, int, char *,
 					     FILE *, unsigned int,
 					     unsigned long);
+int			log_set_file_owner(log_channel, uid_t, gid_t);
 log_channel		log_new_null_channel(void);
 int			log_inc_references(log_channel);
 int			log_dec_references(log_channel);
diff --git a/contrib/bind/include/resolv.h b/contrib/bind/include/resolv.h
index 3065313..414fe08 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.29 1999/10/07 08:24:14 vixie Exp $
+ *	$Id: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $
  */
 
 #ifndef _RESOLV_H_
@@ -145,6 +145,7 @@ struct res_sym {
 #define	RES_MAXRETRANS		30	/* only for resolv.conf/RES_OPTIONS */
 #define	RES_MAXRETRY		5	/* only for resolv.conf/RES_OPTIONS */
 #define	RES_DFLRETRY		2	/* Default #/tries. */
+#define	RES_MAXTIME		65535	/* Infinity, in milliseconds. */
 
 struct __res_state {
 	int	retrans;	 	/* retransmition time interval */
@@ -168,9 +169,17 @@ struct __res_state {
 	res_send_qhook qhook;		/* query hook */
 	res_send_rhook rhook;		/* response hook */
 	int	res_h_errno;		/* last one set for this context */
-	int	_sock;			/* PRIVATE: for res_send i/o */
+	int	_vcsock;		/* PRIVATE: for res_send VC i/o */
 	u_int	_flags;			/* PRIVATE: see below */
-	char	pad[52];		/* On an i386 this means 512b total. */
+	union {
+		char	pad[52];	/* On an i386 this means 512b total. */
+		struct {
+			u_int16_t		nscount;
+			u_int16_t		nstimes[MAXNS];	/* ms. */
+			int			nssocks[MAXNS];
+			struct sockaddr_in	nsaddrs[MAXNS];
+		} _ext;
+	} _u;
 };
 
 typedef struct __res_state *res_state;
@@ -204,6 +213,7 @@ typedef struct __res_state *res_state;
 #define RES_ROTATE	0x00004000	/* rotate ns list after each query */
 #define	RES_NOCHECKNAME	0x00008000	/* do not check names for sanity. */
 #define	RES_KEEPTSIG	0x00010000	/* do not strip TSIG records */
+#define	RES_BLAST	0x00020000	/* blast all recursive servers */
 
 #define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)