summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2008-06-21 20:12:49 +0000
committerchristos <christos@NetBSD.org>2008-06-21 20:12:49 +0000
commita0abbe8fe8348ae032da2577ed804f895413eeeb (patch)
tree91bf0d8615292f1e7d8f226f6950d333b9a50449 /include
parentacba26b8f99bc2496cc9fef32f8dfb2727478186 (diff)
sync with bind-9-5-0
Diffstat (limited to 'include')
-rw-r--r--include/arpa/inet.h4
-rw-r--r--include/arpa/nameser.h7
-rw-r--r--include/arpa/nameser_compat.h4
-rw-r--r--include/netdb.h11
-rw-r--r--include/res_update.h4
-rw-r--r--include/resolv.h23
6 files changed, 31 insertions, 22 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index b4130ff5f59..0f2e9f2b1d3 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.h,v 1.23 2007/03/30 19:57:18 ghen Exp $ */
+/* $NetBSD: inet.h,v 1.24 2008/06/21 20:12:49 christos Exp $ */
/*
* ++Copyright++ 1983, 1993
@@ -53,7 +53,7 @@
/*%
* @(#)inet.h 8.1 (Berkeley) 6/2/93
- * Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp
+ * Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp
*/
#ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index ab714a5a25a..2c30c6bc38b 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nameser.h,v 1.22 2007/03/30 19:57:18 ghen Exp $ */
+/* $NetBSD: nameser.h,v 1.23 2008/06/21 20:12:49 christos Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -47,7 +47,7 @@
*/
/*
- * Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp
+ * Id: nameser.h,v 1.8.672.1 2008/04/03 02:12:21 marka Exp
*/
#ifndef _ARPA_NAMESER_H_
@@ -428,9 +428,10 @@ typedef enum __ns_cert_types {
#define NS_NXT_MAX 127
/*%
- * EDNS0 extended flags, host order.
+ * EDNS0 extended flags and option codes, host order.
*/
#define NS_OPT_DNSSEC_OK 0x8000U
+#define NS_OPT_NSID 3
/*%
* Inline versions of get/put short/long. Pointer is advanced.
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index e5897cf3304..a3251244958 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nameser_compat.h,v 1.3 2007/03/30 19:57:19 ghen Exp $ */
+/* $NetBSD: nameser_compat.h,v 1.4 2008/06/21 20:12:49 christos Exp $ */
/* Copyright (c) 1983, 1989
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
/*%
* from nameser.h 8.1 (Berkeley) 6/2/93
- * Id: nameser_compat.h,v 1.5.18.3 2006/05/19 02:36:00 marka Exp
+ * Id: nameser_compat.h,v 1.8 2006/05/19 02:33:40 marka Exp
*/
#ifndef _ARPA_NAMESER_COMPAT_
diff --git a/include/netdb.h b/include/netdb.h
index c0e2af178ee..93f7d6e73a0 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,6 +1,8 @@
-/* $NetBSD: netdb.h,v 1.59 2007/05/10 17:45:50 christos Exp $ */
+/* $NetBSD: netdb.h,v 1.60 2008/06/21 20:12:49 christos Exp $ */
/*
+ * ++Copyright++ 1980, 1983, 1988, 1993
+ * -
* Copyright (c) 1980, 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -82,7 +84,7 @@
/*
* @(#)netdb.h 8.1 (Berkeley) 6/2/93
- * Id: netdb.h,v 1.15.18.6 2006/10/02 01:23:09 marka Exp
+ * Id: netdb.h,v 1.21.288.1 2008/02/28 05:46:12 marka Exp
*/
#ifndef _NETDB_H_
@@ -130,6 +132,10 @@ typedef _BSD_SIZE_T_ size_t;
__BEGIN_DECLS
extern int h_errno;
+extern int * __h_errno __P((void));
+#ifdef _REENTRANT
+#define h_errno (*__h_errno())
+#endif
__END_DECLS
/*%
@@ -281,6 +287,7 @@ struct addrinfo {
#define NI_NAMEREQD 0x00000004
#define NI_NUMERICSERV 0x00000008
#define NI_DGRAM 0x00000010
+#define NI_WITHSCOPEID 0x00000020
#define NI_NUMERICSCOPE 0x00000040
/*%
diff --git a/include/res_update.h b/include/res_update.h
index 02ca9ba8fde..ea9d5a8c4bc 100644
--- a/include/res_update.h
+++ b/include/res_update.h
@@ -1,4 +1,4 @@
-/* $NetBSD: res_update.h,v 1.5 2007/03/30 19:57:17 ghen Exp $ */
+/* $NetBSD: res_update.h,v 1.6 2008/06/21 20:12:49 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -18,7 +18,7 @@
*/
/*
- * Id: res_update.h,v 1.2.18.1 2005/04/27 05:00:49 sra Exp
+ * Id: res_update.h,v 1.3 2005/04/27 04:56:15 sra Exp
*/
#ifndef __RES_UPDATE_H
diff --git a/include/resolv.h b/include/resolv.h
index 00e5ba500ba..92322435b5c 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: resolv.h,v 1.33 2007/03/30 19:57:18 ghen Exp $ */
+/* $NetBSD: resolv.h,v 1.34 2008/06/21 20:12:49 christos Exp $ */
/*
* Copyright (c) 1983, 1987, 1989
@@ -48,7 +48,7 @@
/*%
* @(#)resolv.h 8.1 (Berkeley) 6/2/93
- * Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp
+ * Id: resolv.h,v 1.23.564.1 2008/04/03 02:12:21 marka Exp
*/
#ifndef _RESOLV_H_
@@ -245,6 +245,7 @@ union res_sockaddr_union {
#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_NSID 0x00040000 /*%< request name server ID */
#define RES_NOTLDQUERY 0x00100000 /*%< don't unqualified name as a tld */
#define RES_USE_DNSSEC 0x00200000 /*%< use DNSSEC using OK bit in OPT */
/* #define RES_DEBUG2 0x00400000 */ /* nslookup internal */
@@ -297,20 +298,16 @@ __END_DECLS
#define hostalias __hostalias
#define p_query __p_query
#define res_close __res_close
-#define res_opt __res_opt
+#define res_init __res_init
#define res_isourserver __res_isourserver
+#define res_mkquery __res_mkquery
+#define res_opt __res_opt
+#define res_query __res_query
#define res_querydomain __res_querydomain
+#define res_search __res_search
#define res_send __res_send
#define res_sendsigned __res_sendsigned
-#ifdef BIND_RES_POSIX3
-#define dn_expand __dn_expand
-#define res_init __res_init
-#define res_query __res_query
-#define res_search __res_search
-#define res_mkquery __res_mkquery
-#endif
-
__BEGIN_DECLS
void fp_nquery(const u_char *, int, FILE *);
void fp_query(const u_char *, FILE *);
@@ -351,6 +348,7 @@ extern const struct res_sym __p_rcode_syms[];
#define b64_pton __b64_pton
#define dn_comp __dn_comp
#define dn_count_labels __dn_count_labels
+#define dn_expand __dn_expand
#define dn_skipname __dn_skipname
#define fp_resstat __fp_resstat
#define loc_aton __loc_aton
@@ -393,6 +391,7 @@ extern const struct res_sym __p_rcode_syms[];
#define sym_ntos __sym_ntos
#define sym_ston __sym_ston
#define res_nopt __res_nopt
+#define res_nopt_rdata __res_nopt_rdata
#define res_ndestroy __res_ndestroy
#define res_nametoclass __res_nametoclass
#define res_nametotype __res_nametotype
@@ -474,6 +473,8 @@ int res_findzonecut2(res_state, const char *, ns_class, int,
union res_sockaddr_union *, int);
void res_nclose(res_state);
int res_nopt(res_state, int, u_char *, int, int);
+int res_nopt_rdata(res_state, int, u_char *, int, u_char *,
+ u_short, u_short, u_char *);
void res_send_setqhook(res_send_qhook);
void res_send_setrhook(res_send_rhook);
int __res_vinit(res_state, int);