diff options
| author | christos <christos@NetBSD.org> | 2015-07-08 17:28:54 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2015-07-08 17:28:54 +0000 |
| commit | 0526321d552ad2fa3cc59dfd8bdc4ebba6cca675 (patch) | |
| tree | df188b89222248d3a46c89913f3fd7ffc9ad9dee /external/bsd/bind/include | |
| parent | bc1451cde60e5635b8089d8f4d876a6fdd5656a2 (diff) | |
Merge changes.
Diffstat (limited to 'external/bsd/bind/include')
| -rw-r--r-- | external/bsd/bind/include/config.h | 17 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/code.h | 21 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/enumclass.h | 2 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/enumtype.h | 4 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/rdatastruct.h | 57 | ||||
| -rw-r--r-- | external/bsd/bind/include/isc/platform.h | 5 |
6 files changed, 82 insertions, 24 deletions
diff --git a/external/bsd/bind/include/config.h b/external/bsd/bind/include/config.h index 703861abeb1..acdd78b170c 100644 --- a/external/bsd/bind/include/config.h +++ b/external/bsd/bind/include/config.h @@ -238,6 +238,12 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if you have the `fseeko' function. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the `ftello' function. */ +#define HAVE_FTELLO 1 + /* Build with GeoIP support */ /* #undef HAVE_GEOIP */ @@ -247,6 +253,9 @@ int sigwait(const unsigned int *set, int *sig); /* Build with GeoIP Country IPv6 support */ /* #undef HAVE_GEOIP_V6 */ +/* Define to use gperftools CPU profiler. */ +/* #undef HAVE_GPERFTOOLS_PROFILER */ + /* Define to 1 if you have the <gssapi/gssapi.h> header file. */ #define HAVE_GSSAPI_GSSAPI_H 1 @@ -259,7 +268,7 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the <gssapi_krb5.h> header file. */ /* #undef HAVE_GSSAPI_KRB5_H */ -/* Define to 1 if you have the `if_nametoindex' function. */ +/* Define to 1 if you have the if_nametoindex function. */ #define HAVE_IF_NAMETOINDEX 1 /* Define to 1 if you have the <inttypes.h> header file. */ @@ -460,6 +469,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the `usleep' function. */ #define HAVE_USLEEP 1 +/* HMAC_*() return ints */ +/* #undef HMAC_RETURN_INT */ + /* Use HMAC-SHA1 for Source Identity Token generation */ /* #undef HMAC_SHA1_SIT */ @@ -475,6 +487,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to the flags type used by getnameinfo(3). */ #define IRS_GETNAMEINFO_FLAGS_T int +/* Define to the sockaddr length type used by getnameinfo(3). */ +#define IRS_GETNAMEINFO_SOCKLEN_T socklen_t + /* Define to allow building of objects for dlopen(). */ #define ISC_DLZ_DLOPEN 1 diff --git a/external/bsd/bind/include/dns/code.h b/external/bsd/bind/include/dns/code.h index d6a045be1b9..0832f6e1bf7 100644 --- a/external/bsd/bind/include/dns/code.h +++ b/external/bsd/bind/include/dns/code.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -85,6 +85,7 @@ #include "rdata/generic/hip_55.c" #include "rdata/generic/cds_59.c" #include "rdata/generic/cdnskey_60.c" +#include "rdata/generic/openpgpkey_61.c" #include "rdata/generic/spf_99.c" #include "rdata/generic/unspec_103.c" #include "rdata/generic/nid_104.c" @@ -201,6 +202,7 @@ case 55: result = fromtext_hip(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 59: result = fromtext_cds(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 60: result = fromtext_cdnskey(rdclass, type, lexer, origin, options, target, callbacks); break; \ + case 61: result = fromtext_openpgpkey(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 99: result = fromtext_spf(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 103: result = fromtext_unspec(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 104: result = fromtext_nid(rdclass, type, lexer, origin, options, target, callbacks); break; \ @@ -321,6 +323,7 @@ case 55: result = totext_hip(rdata, tctx, target); break; \ case 59: result = totext_cds(rdata, tctx, target); break; \ case 60: result = totext_cdnskey(rdata, tctx, target); break; \ + case 61: result = totext_openpgpkey(rdata, tctx, target); break; \ case 99: result = totext_spf(rdata, tctx, target); break; \ case 103: result = totext_unspec(rdata, tctx, target); break; \ case 104: result = totext_nid(rdata, tctx, target); break; \ @@ -441,6 +444,7 @@ case 55: result = fromwire_hip(rdclass, type, source, dctx, options, target); break; \ case 59: result = fromwire_cds(rdclass, type, source, dctx, options, target); break; \ case 60: result = fromwire_cdnskey(rdclass, type, source, dctx, options, target); break; \ + case 61: result = fromwire_openpgpkey(rdclass, type, source, dctx, options, target); break; \ case 99: result = fromwire_spf(rdclass, type, source, dctx, options, target); break; \ case 103: result = fromwire_unspec(rdclass, type, source, dctx, options, target); break; \ case 104: result = fromwire_nid(rdclass, type, source, dctx, options, target); break; \ @@ -561,6 +565,7 @@ case 55: result = towire_hip(rdata, cctx, target); break; \ case 59: result = towire_cds(rdata, cctx, target); break; \ case 60: result = towire_cdnskey(rdata, cctx, target); break; \ + case 61: result = towire_openpgpkey(rdata, cctx, target); break; \ case 99: result = towire_spf(rdata, cctx, target); break; \ case 103: result = towire_unspec(rdata, cctx, target); break; \ case 104: result = towire_nid(rdata, cctx, target); break; \ @@ -681,6 +686,7 @@ case 55: result = compare_hip(rdata1, rdata2); break; \ case 59: result = compare_cds(rdata1, rdata2); break; \ case 60: result = compare_cdnskey(rdata1, rdata2); break; \ + case 61: result = compare_openpgpkey(rdata1, rdata2); break; \ case 99: result = compare_spf(rdata1, rdata2); break; \ case 103: result = compare_unspec(rdata1, rdata2); break; \ case 104: result = compare_nid(rdata1, rdata2); break; \ @@ -801,6 +807,7 @@ case 55: result = casecompare_hip(rdata1, rdata2); break; \ case 59: result = casecompare_cds(rdata1, rdata2); break; \ case 60: result = casecompare_cdnskey(rdata1, rdata2); break; \ + case 61: result = casecompare_openpgpkey(rdata1, rdata2); break; \ case 99: result = casecompare_spf(rdata1, rdata2); break; \ case 103: result = casecompare_unspec(rdata1, rdata2); break; \ case 104: result = casecompare_nid(rdata1, rdata2); break; \ @@ -921,6 +928,7 @@ case 55: result = fromstruct_hip(rdclass, type, source, target); break; \ case 59: result = fromstruct_cds(rdclass, type, source, target); break; \ case 60: result = fromstruct_cdnskey(rdclass, type, source, target); break; \ + case 61: result = fromstruct_openpgpkey(rdclass, type, source, target); break; \ case 99: result = fromstruct_spf(rdclass, type, source, target); break; \ case 103: result = fromstruct_unspec(rdclass, type, source, target); break; \ case 104: result = fromstruct_nid(rdclass, type, source, target); break; \ @@ -1041,6 +1049,7 @@ case 55: result = tostruct_hip(rdata, target, mctx); break; \ case 59: result = tostruct_cds(rdata, target, mctx); break; \ case 60: result = tostruct_cdnskey(rdata, target, mctx); break; \ + case 61: result = tostruct_openpgpkey(rdata, target, mctx); break; \ case 99: result = tostruct_spf(rdata, target, mctx); break; \ case 103: result = tostruct_unspec(rdata, target, mctx); break; \ case 104: result = tostruct_nid(rdata, target, mctx); break; \ @@ -1161,6 +1170,7 @@ case 55: freestruct_hip(source); break; \ case 59: freestruct_cds(source); break; \ case 60: freestruct_cdnskey(source); break; \ + case 61: freestruct_openpgpkey(source); break; \ case 99: freestruct_spf(source); break; \ case 103: freestruct_unspec(source); break; \ case 104: freestruct_nid(source); break; \ @@ -1281,6 +1291,7 @@ case 55: result = additionaldata_hip(rdata, add, arg); break; \ case 59: result = additionaldata_cds(rdata, add, arg); break; \ case 60: result = additionaldata_cdnskey(rdata, add, arg); break; \ + case 61: result = additionaldata_openpgpkey(rdata, add, arg); break; \ case 99: result = additionaldata_spf(rdata, add, arg); break; \ case 103: result = additionaldata_unspec(rdata, add, arg); break; \ case 104: result = additionaldata_nid(rdata, add, arg); break; \ @@ -1401,6 +1412,7 @@ case 55: result = digest_hip(rdata, digest, arg); break; \ case 59: result = digest_cds(rdata, digest, arg); break; \ case 60: result = digest_cdnskey(rdata, digest, arg); break; \ + case 61: result = digest_openpgpkey(rdata, digest, arg); break; \ case 99: result = digest_spf(rdata, digest, arg); break; \ case 103: result = digest_unspec(rdata, digest, arg); break; \ case 104: result = digest_nid(rdata, digest, arg); break; \ @@ -1521,6 +1533,7 @@ case 55: result = checkowner_hip(name, rdclass, type, wildcard); break; \ case 59: result = checkowner_cds(name, rdclass, type, wildcard); break; \ case 60: result = checkowner_cdnskey(name, rdclass, type, wildcard); break; \ + case 61: result = checkowner_openpgpkey(name, rdclass, type, wildcard); break; \ case 99: result = checkowner_spf(name, rdclass, type, wildcard); break; \ case 103: result = checkowner_unspec(name, rdclass, type, wildcard); break; \ case 104: result = checkowner_nid(name, rdclass, type, wildcard); break; \ @@ -1641,6 +1654,7 @@ case 55: result = checknames_hip(rdata, owner, bad); break; \ case 59: result = checknames_cds(rdata, owner, bad); break; \ case 60: result = checknames_cdnskey(rdata, owner, bad); break; \ + case 61: result = checknames_openpgpkey(rdata, owner, bad); break; \ case 99: result = checknames_spf(rdata, owner, bad); break; \ case 103: result = checknames_unspec(rdata, owner, bad); break; \ case 104: result = checknames_nid(rdata, owner, bad); break; \ @@ -1828,6 +1842,9 @@ case 208: \ RDATATYPE_COMPARE("hip", 55, _typename, _length, _typep); \ break; \ + case 49: \ + RDATATYPE_COMPARE("openpgpkey", 61, _typename, _length, _typep); \ + break; \ case 230: \ RDATATYPE_COMPARE("uinfo", 100, _typename, _length, _typep); \ break; \ @@ -1935,6 +1952,7 @@ case 55: return (RRTYPE_HIP_ATTRIBUTES); \ case 59: return (RRTYPE_CDS_ATTRIBUTES); \ case 60: return (RRTYPE_CDNSKEY_ATTRIBUTES); \ + case 61: return (RRTYPE_OPENPGPKEY_ATTRIBUTES); \ case 99: return (RRTYPE_SPF_ATTRIBUTES); \ case 100: return (DNS_RDATATYPEATTR_RESERVED); \ case 101: return (DNS_RDATATYPEATTR_RESERVED); \ @@ -2015,6 +2033,7 @@ case 55: return (str_totext("HIP", target)); \ case 59: return (str_totext("CDS", target)); \ case 60: return (str_totext("CDNSKEY", target)); \ + case 61: return (str_totext("OPENPGPKEY", target)); \ case 99: return (str_totext("SPF", target)); \ case 100: return (str_totext("UINFO", target)); \ case 101: return (str_totext("UID", target)); \ diff --git a/external/bsd/bind/include/dns/enumclass.h b/external/bsd/bind/include/dns/enumclass.h index f84e81d548d..5736d39c45f 100644 --- a/external/bsd/bind/include/dns/enumclass.h +++ b/external/bsd/bind/include/dns/enumclass.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any diff --git a/external/bsd/bind/include/dns/enumtype.h b/external/bsd/bind/include/dns/enumtype.h index 577c2c5c982..4a0f2886f71 100644 --- a/external/bsd/bind/include/dns/enumtype.h +++ b/external/bsd/bind/include/dns/enumtype.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -80,6 +80,7 @@ enum { dns_rdatatype_hip = 55, dns_rdatatype_cds = 59, dns_rdatatype_cdnskey = 60, + dns_rdatatype_openpgpkey = 61, dns_rdatatype_spf = 99, dns_rdatatype_unspec = 103, dns_rdatatype_nid = 104, @@ -153,6 +154,7 @@ enum { #define dns_rdatatype_hip ((dns_rdatatype_t)dns_rdatatype_hip) #define dns_rdatatype_cds ((dns_rdatatype_t)dns_rdatatype_cds) #define dns_rdatatype_cdnskey ((dns_rdatatype_t)dns_rdatatype_cdnskey) +#define dns_rdatatype_openpgpkey ((dns_rdatatype_t)dns_rdatatype_openpgpkey) #define dns_rdatatype_spf ((dns_rdatatype_t)dns_rdatatype_spf) #define dns_rdatatype_unspec ((dns_rdatatype_t)dns_rdatatype_unspec) #define dns_rdatatype_nid ((dns_rdatatype_t)dns_rdatatype_nid) diff --git a/external/bsd/bind/include/dns/rdatastruct.h b/external/bsd/bind/include/dns/rdatastruct.h index dccfa5d1e4a..b413f5511f8 100644 --- a/external/bsd/bind/include/dns/rdatastruct.h +++ b/external/bsd/bind/include/dns/rdatastruct.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -2008,7 +2008,34 @@ typedef struct dns_rdata_cdnskey { #endif /* GENERIC_CDNSKEY_60_H */ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef GENERIC_OPENPGPKEY_61_H +#define GENERIC_OPENPGPKEY_61_H 1 + +typedef struct dns_rdata_openpgpkey { + dns_rdatacommon_t common; + isc_mem_t * mctx; + isc_uint16_t length; + unsigned char * keyring; +} dns_rdata_openpgpkey_t; + +#endif /* GENERIC_OPENPGPKEY_61_H */ +/* + * Copyright (C) 2004, 2005, 2007, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -2030,33 +2057,23 @@ typedef struct dns_rdata_cdnskey { /* Id: spf_99.h,v 1.4 2007/06/19 23:47:17 tbox Exp */ typedef struct dns_rdata_spf_string { - isc_uint8_t length; - unsigned char *data; + isc_uint8_t length; + unsigned char *data; } dns_rdata_spf_string_t; typedef struct dns_rdata_spf { - dns_rdatacommon_t common; - isc_mem_t *mctx; - unsigned char *txt; - isc_uint16_t txt_len; - /* private */ - isc_uint16_t offset; + dns_rdatacommon_t common; + isc_mem_t *mctx; + unsigned char *txt; + isc_uint16_t txt_len; + /* private */ + isc_uint16_t offset; } dns_rdata_spf_t; /* * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done * via rdatastructpre.h and rdatastructsuf.h. */ - -isc_result_t -dns_rdata_spf_first(dns_rdata_spf_t *); - -isc_result_t -dns_rdata_spf_next(dns_rdata_spf_t *); - -isc_result_t -dns_rdata_spf_current(dns_rdata_spf_t *, dns_rdata_spf_string_t *); - #endif /* GENERIC_SPF_99_H */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") diff --git a/external/bsd/bind/include/isc/platform.h b/external/bsd/bind/include/isc/platform.h index 5ee00732356..a1b9708cbfe 100644 --- a/external/bsd/bind/include/isc/platform.h +++ b/external/bsd/bind/include/isc/platform.h @@ -134,6 +134,11 @@ #undef ISC_PLATFORM_FIXIN6ISADDR /*! \brief + * Define if the system has struct sockaddr_storage. + */ +#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1 + +/*! \brief * Define if the system supports kqueue multiplexing */ #define ISC_PLATFORM_HAVEKQUEUE 1 |
