diff options
| author | christos <christos@NetBSD.org> | 2011-09-11 18:55:24 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2011-09-11 18:55:24 +0000 |
| commit | d4ecc50fcd7f252a8bb7d9ee91a0fec6246e0bd2 (patch) | |
| tree | 2dec4b792c2ba583292531441bd69b0dd9ed1ce8 /external/bsd/bind/include | |
| parent | 9feded47959dc7443fc9ce7c3c26af5d36f2523a (diff) | |
merge bind-9.9.0a1
Diffstat (limited to 'external/bsd/bind/include')
| -rw-r--r-- | external/bsd/bind/include/config.h | 21 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/code.h | 99 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/enumtype.h | 2 | ||||
| -rw-r--r-- | external/bsd/bind/include/dns/rdatastruct.h | 96 | ||||
| -rw-r--r-- | external/bsd/bind/include/isc/platform.h | 4 |
5 files changed, 130 insertions, 92 deletions
diff --git a/external/bsd/bind/include/config.h b/external/bsd/bind/include/config.h index 8f5d24d0e8b..69f54e858da 100644 --- a/external/bsd/bind/include/config.h +++ b/external/bsd/bind/include/config.h @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* Id: config.h.in,v 1.143.8.1 2011-02-03 05:52:35 marka Exp */ +/* Id: config.h.in,v 1.147 2011-07-28 13:33:09 tbox Exp */ /*! \file */ @@ -160,6 +160,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to enable the "filter-aaaa-on-v4" option. */ /* #undef ALLOW_FILTER_AAAA_ON_V4 */ +/* define if ATF unit tests are to be built. */ +/* #undef ATF_TEST */ + /* Define if recvmsg() does not meet all of the BSD socket API specifications. */ /* #undef BROKEN_RECVMSG */ @@ -219,7 +222,7 @@ int sigwait(const unsigned int *set, int *sig); #define HAVE_GSSAPI_GSSAPI_H 1 /* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */ -/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ +#define HAVE_GSSAPI_GSSAPI_KRB5_H 1 /* Define to 1 if you have the <gssapi.h> header file. */ #define HAVE_GSSAPI_H 1 @@ -234,7 +237,7 @@ int sigwait(const unsigned int *set, int *sig); /* #undef HAVE_KERBEROSV5_KRB5_H */ /* Define to 1 if you have the <krb5.h> header file. */ -/* #undef HAVE_KRB5_H */ +#define HAVE_KRB5_H 1 /* Define to 1 if you have the <krb5/krb5.h> header file. */ #define HAVE_KRB5_KRB5_H 1 @@ -251,9 +254,6 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the `c_r' library (-lc_r). */ /* #undef HAVE_LIBC_R */ -/* Define to 1 if you have the `dl' library (-ldl). */ -/* #undef HAVE_LIBDL */ - /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ @@ -362,6 +362,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `usleep' function. */ +#define HAVE_USLEEP 1 + /* return type of gai_strerror */ #define IRS_GAISTRERROR_RETURN_T const char * @@ -371,6 +374,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 allow building of objects for dlopen(). */ +#define ISC_DLZ_DLOPEN 1 + /* Defined if extern char *optarg is not declared. */ /* #undef NEED_OPTARG */ @@ -400,6 +406,9 @@ int sigwait(const unsigned int *set, int *sig); (O_NDELAY/O_NONBLOCK). */ #define PORT_NONBLOCK O_NONBLOCK +/* The size of `void *', as computed by sizeof. */ +#define SIZEOF_VOID_P 8 + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/external/bsd/bind/include/dns/code.h b/external/bsd/bind/include/dns/code.h index 4d97162377b..127f929cd56 100644 --- a/external/bsd/bind/include/dns/code.h +++ b/external/bsd/bind/include/dns/code.h @@ -65,7 +65,7 @@ #include "rdata/generic/loc_29.c" #include "rdata/generic/nxt_30.c" #include "rdata/in_1/srv_33.c" -#include "rdata/in_1/naptr_35.c" +#include "rdata/generic/naptr_35.c" #include "rdata/in_1/kx_36.c" #include "rdata/generic/cert_37.c" #include "rdata/in_1/a6_38.c" @@ -86,6 +86,7 @@ #include "rdata/generic/unspec_103.c" #include "rdata/generic/tkey_249.c" #include "rdata/any_255/tsig_250.c" +#include "rdata/generic/uri_256.c" #include "rdata/generic/dlv_32769.c" #include "rdata/generic/keydata_65533.c" @@ -154,11 +155,7 @@ default: result = DNS_R_UNKNOWN; break; \ } \ break; \ - case 35: switch (rdclass) { \ - case 1: result = fromtext_in_naptr(rdclass, type, lexer, origin, options, target, callbacks); break; \ - default: result = DNS_R_UNKNOWN; break; \ - } \ - break; \ + case 35: result = fromtext_naptr(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 36: switch (rdclass) { \ case 1: result = fromtext_in_kx(rdclass, type, lexer, origin, options, target, callbacks); break; \ default: result = DNS_R_UNKNOWN; break; \ @@ -199,6 +196,7 @@ default: result = DNS_R_UNKNOWN; break; \ } \ break; \ + case 256: result = fromtext_uri(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 32769: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 65533: result = fromtext_keydata(rdclass, type, lexer, origin, options, target, callbacks); break; \ default: result = DNS_R_UNKNOWN; break; \ @@ -267,11 +265,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata->rdclass) { \ - case 1: result = totext_in_naptr(rdata, tctx, target); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = totext_naptr(rdata, tctx, target); break; \ case 36: switch (rdata->rdclass) { \ case 1: result = totext_in_kx(rdata, tctx, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -312,6 +306,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = totext_uri(rdata, tctx, target); break; \ case 32769: result = totext_dlv(rdata, tctx, target); break; \ case 65533: result = totext_keydata(rdata, tctx, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -380,11 +375,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdclass) { \ - case 1: result = fromwire_in_naptr(rdclass, type, source, dctx, options, target); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = fromwire_naptr(rdclass, type, source, dctx, options, target); break; \ case 36: switch (rdclass) { \ case 1: result = fromwire_in_kx(rdclass, type, source, dctx, options, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -425,6 +416,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = fromwire_uri(rdclass, type, source, dctx, options, target); break; \ case 32769: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \ case 65533: result = fromwire_keydata(rdclass, type, source, dctx, options, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -493,11 +485,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata->rdclass) { \ - case 1: result = towire_in_naptr(rdata, cctx, target); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = towire_naptr(rdata, cctx, target); break; \ case 36: switch (rdata->rdclass) { \ case 1: result = towire_in_kx(rdata, cctx, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -538,6 +526,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = towire_uri(rdata, cctx, target); break; \ case 32769: result = towire_dlv(rdata, cctx, target); break; \ case 65533: result = towire_keydata(rdata, cctx, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -606,11 +595,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata1->rdclass) { \ - case 1: result = compare_in_naptr(rdata1, rdata2); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = compare_naptr(rdata1, rdata2); break; \ case 36: switch (rdata1->rdclass) { \ case 1: result = compare_in_kx(rdata1, rdata2); break; \ default: use_default = ISC_TRUE; break; \ @@ -651,6 +636,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = compare_uri(rdata1, rdata2); break; \ case 32769: result = compare_dlv(rdata1, rdata2); break; \ case 65533: result = compare_keydata(rdata1, rdata2); break; \ default: use_default = ISC_TRUE; break; \ @@ -719,11 +705,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata1->rdclass) { \ - case 1: result = casecompare_in_naptr(rdata1, rdata2); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = casecompare_naptr(rdata1, rdata2); break; \ case 36: switch (rdata1->rdclass) { \ case 1: result = casecompare_in_kx(rdata1, rdata2); break; \ default: use_default = ISC_TRUE; break; \ @@ -764,6 +746,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = casecompare_uri(rdata1, rdata2); break; \ case 32769: result = casecompare_dlv(rdata1, rdata2); break; \ case 65533: result = casecompare_keydata(rdata1, rdata2); break; \ default: use_default = ISC_TRUE; break; \ @@ -832,11 +815,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdclass) { \ - case 1: result = fromstruct_in_naptr(rdclass, type, source, target); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = fromstruct_naptr(rdclass, type, source, target); break; \ case 36: switch (rdclass) { \ case 1: result = fromstruct_in_kx(rdclass, type, source, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -877,6 +856,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = fromstruct_uri(rdclass, type, source, target); break; \ case 32769: result = fromstruct_dlv(rdclass, type, source, target); break; \ case 65533: result = fromstruct_keydata(rdclass, type, source, target); break; \ default: use_default = ISC_TRUE; break; \ @@ -945,11 +925,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata->rdclass) { \ - case 1: result = tostruct_in_naptr(rdata, target, mctx); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = tostruct_naptr(rdata, target, mctx); break; \ case 36: switch (rdata->rdclass) { \ case 1: result = tostruct_in_kx(rdata, target, mctx); break; \ default: use_default = ISC_TRUE; break; \ @@ -990,6 +966,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = tostruct_uri(rdata, target, mctx); break; \ case 32769: result = tostruct_dlv(rdata, target, mctx); break; \ case 65533: result = tostruct_keydata(rdata, target, mctx); break; \ default: use_default = ISC_TRUE; break; \ @@ -1058,11 +1035,7 @@ default: break; \ } \ break; \ - case 35: switch (common->rdclass) { \ - case 1: freestruct_in_naptr(source); break; \ - default: break; \ - } \ - break; \ + case 35: freestruct_naptr(source); break; \ case 36: switch (common->rdclass) { \ case 1: freestruct_in_kx(source); break; \ default: break; \ @@ -1103,6 +1076,7 @@ default: break; \ } \ break; \ + case 256: freestruct_uri(source); break; \ case 32769: freestruct_dlv(source); break; \ case 65533: freestruct_keydata(source); break; \ default: break; \ @@ -1171,11 +1145,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata->rdclass) { \ - case 1: result = additionaldata_in_naptr(rdata, add, arg); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = additionaldata_naptr(rdata, add, arg); break; \ case 36: switch (rdata->rdclass) { \ case 1: result = additionaldata_in_kx(rdata, add, arg); break; \ default: use_default = ISC_TRUE; break; \ @@ -1216,6 +1186,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = additionaldata_uri(rdata, add, arg); break; \ case 32769: result = additionaldata_dlv(rdata, add, arg); break; \ case 65533: result = additionaldata_keydata(rdata, add, arg); break; \ default: use_default = ISC_TRUE; break; \ @@ -1284,11 +1255,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata->rdclass) { \ - case 1: result = digest_in_naptr(rdata, digest, arg); break; \ - default: use_default = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = digest_naptr(rdata, digest, arg); break; \ case 36: switch (rdata->rdclass) { \ case 1: result = digest_in_kx(rdata, digest, arg); break; \ default: use_default = ISC_TRUE; break; \ @@ -1329,6 +1296,7 @@ default: use_default = ISC_TRUE; break; \ } \ break; \ + case 256: result = digest_uri(rdata, digest, arg); break; \ case 32769: result = digest_dlv(rdata, digest, arg); break; \ case 65533: result = digest_keydata(rdata, digest, arg); break; \ default: use_default = ISC_TRUE; break; \ @@ -1397,11 +1365,7 @@ default: result = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdclass) { \ - case 1: result = checkowner_in_naptr(name, rdclass, type, wildcard); break; \ - default: result = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = checkowner_naptr(name, rdclass, type, wildcard); break; \ case 36: switch (rdclass) { \ case 1: result = checkowner_in_kx(name, rdclass, type, wildcard); break; \ default: result = ISC_TRUE; break; \ @@ -1442,6 +1406,7 @@ default: result = ISC_TRUE; break; \ } \ break; \ + case 256: result = checkowner_uri(name, rdclass, type, wildcard); break; \ case 32769: result = checkowner_dlv(name, rdclass, type, wildcard); break; \ case 65533: result = checkowner_keydata(name, rdclass, type, wildcard); break; \ default: result = ISC_TRUE; break; \ @@ -1510,11 +1475,7 @@ default: result = ISC_TRUE; break; \ } \ break; \ - case 35: switch (rdata->rdclass) { \ - case 1: result = checknames_in_naptr(rdata, owner, bad); break; \ - default: result = ISC_TRUE; break; \ - } \ - break; \ + case 35: result = checknames_naptr(rdata, owner, bad); break; \ case 36: switch (rdata->rdclass) { \ case 1: result = checknames_in_kx(rdata, owner, bad); break; \ default: result = ISC_TRUE; break; \ @@ -1555,6 +1516,7 @@ default: result = ISC_TRUE; break; \ } \ break; \ + case 256: result = checknames_uri(rdata, owner, bad); break; \ case 32769: result = checknames_dlv(rdata, owner, bad); break; \ case 65533: result = checknames_keydata(rdata, owner, bad); break; \ default: result = ISC_TRUE; break; \ @@ -1750,6 +1712,9 @@ case 68: \ RDATATYPE_COMPARE("any", 255, _typename, _length, _typep); \ break; \ + case 56: \ + RDATATYPE_COMPARE("uri", 256, _typename, _length, _typep); \ + break; \ } #define RDATATYPE_ATTRIBUTE_SW \ switch (type) { \ @@ -1817,6 +1782,7 @@ case 253: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \ case 254: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \ case 255: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \ + case 256: return (RRTYPE_URI_ATTRIBUTES); \ case 32769: return (RRTYPE_DLV_ATTRIBUTES); \ case 65533: return (RRTYPE_KEYDATA_ATTRIBUTES); \ } @@ -1886,6 +1852,7 @@ case 253: return (str_totext("MAILB", target)); \ case 254: return (str_totext("MAILA", target)); \ case 255: return (str_totext("ANY", target)); \ + case 256: return (str_totext("URI", target)); \ case 32769: return (str_totext("DLV", target)); \ case 65533: return (str_totext("KEYDATA", target)); \ } diff --git a/external/bsd/bind/include/dns/enumtype.h b/external/bsd/bind/include/dns/enumtype.h index 429362345de..b76ddedb20f 100644 --- a/external/bsd/bind/include/dns/enumtype.h +++ b/external/bsd/bind/include/dns/enumtype.h @@ -81,6 +81,7 @@ enum { dns_rdatatype_unspec = 103, dns_rdatatype_tkey = 249, dns_rdatatype_tsig = 250, + dns_rdatatype_uri = 256, dns_rdatatype_dlv = 32769, dns_rdatatype_keydata = 65533, dns_rdatatype_ixfr = 251, @@ -143,6 +144,7 @@ enum { #define dns_rdatatype_unspec ((dns_rdatatype_t)dns_rdatatype_unspec) #define dns_rdatatype_tkey ((dns_rdatatype_t)dns_rdatatype_tkey) #define dns_rdatatype_tsig ((dns_rdatatype_t)dns_rdatatype_tsig) +#define dns_rdatatype_uri ((dns_rdatatype_t)dns_rdatatype_uri) #define dns_rdatatype_dlv ((dns_rdatatype_t)dns_rdatatype_dlv) #define dns_rdatatype_keydata ((dns_rdatatype_t)dns_rdatatype_keydata) #define dns_rdatatype_ixfr ((dns_rdatatype_t)dns_rdatatype_ixfr) diff --git a/external/bsd/bind/include/dns/rdatastruct.h b/external/bsd/bind/include/dns/rdatastruct.h index d99d7efd97d..a66b3c9d392 100644 --- a/external/bsd/bind/include/dns/rdatastruct.h +++ b/external/bsd/bind/include/dns/rdatastruct.h @@ -1176,7 +1176,7 @@ typedef struct dns_rdata_in_srv { #endif /* IN_1_SRV_33_H */ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -1192,15 +1192,15 @@ typedef struct dns_rdata_in_srv { * PERFORMANCE OF THIS SOFTWARE. */ -#ifndef IN_1_NAPTR_35_H -#define IN_1_NAPTR_35_H 1 +#ifndef GENERIC_NAPTR_35_H +#define GENERIC_NAPTR_35_H 1 -/* Id: naptr_35.h,v 1.23 2007-06-19 23:47:17 tbox Exp */ +/* Id: naptr_35.h,v 1.2 2011-08-16 23:46:36 tbox Exp */ -/*! +/*! * \brief Per RFC2915 */ -typedef struct dns_rdata_in_naptr { +typedef struct dns_rdata_naptr { dns_rdatacommon_t common; isc_mem_t *mctx; isc_uint16_t order; @@ -1212,9 +1212,9 @@ typedef struct dns_rdata_in_naptr { char *regexp; isc_uint8_t regexp_len; dns_name_t replacement; -} dns_rdata_in_naptr_t; +} dns_rdata_naptr_t; -#endif /* IN_1_NAPTR_35_H */ +#endif /* GENERIC_NAPTR_35_H */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. @@ -1707,7 +1707,7 @@ typedef struct dns_rdata_in_dhcid { #endif /* IN_1_DHCID_49_H */ /* - * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2008, 2011 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 @@ -1726,7 +1726,7 @@ typedef struct dns_rdata_in_dhcid { #ifndef GENERIC_NSEC3_50_H #define GENERIC_NSEC3_50_H 1 -/* Id: nsec3_50.h,v 1.4 2008-09-25 04:02:39 tbox Exp */ +/* Id: nsec3_50.h,v 1.6 2011-06-10 23:47:32 tbox Exp */ /*! * \brief Per RFC 5155 */ @@ -1754,7 +1754,16 @@ typedef struct dns_rdata_nsec3 { #define DNS_NSEC3FLAG_OPTOUT 0x01U /*% - * Non-standard, NSEC3PARAM only. + * The following flags are used in the private-type record (implemented in + * lib/dns/private.c) which is used to store NSEC3PARAM data during the + * time when it is not legal to have an actual NSEC3PARAM record in the + * zone. They are defined here because the private-type record uses the + * same flags field for the OPTOUT flag above and for the private flags + * below. XXX: This should be considered for refactoring. + */ + +/*% + * Non-standard, private type only. * * Create a corresponding NSEC3 chain. * Once the NSEC3 chain is complete this flag will be removed to signal @@ -1763,13 +1772,14 @@ typedef struct dns_rdata_nsec3 { * This flag is automatically set when a NSEC3PARAM record is added to * the zone via UPDATE. * - * NSEC3PARAM records with this flag set are supposed to be ignored by - * RFC 5155 compliant nameservers. + * NSEC3PARAM records containing this flag should never be published, + * but if they are, they should be ignored by RFC 5155 compliant + * nameservers. */ #define DNS_NSEC3FLAG_CREATE 0x80U /*% - * Non-standard, NSEC3PARAM only. + * Non-standard, private type only. * * The corresponding NSEC3 set is to be removed once the NSEC chain * has been generated. @@ -1777,24 +1787,39 @@ typedef struct dns_rdata_nsec3 { * This flag is automatically set when the last active NSEC3PARAM record * is removed from the zone via UPDATE. * - * NSEC3PARAM records with this flag set are supposed to be ignored by - * RFC 5155 compliant nameservers. + * NSEC3PARAM records containing this flag should never be published, + * but if they are, they should be ignored by RFC 5155 compliant + * nameservers. */ #define DNS_NSEC3FLAG_REMOVE 0x40U /*% - * Non-standard, NSEC3PARAM only. + * Non-standard, private type only. + * + * When set with the CREATE flag, a corresponding NSEC3 chain will be + * created when the zone becomes capable of supporting one (i.e., when it + * has a DNSKEY RRset containing at least one NSEC3-capable algorithm). + * Without this flag, NSEC3 chain creation would be attempted immediately, + * fail, and the private type record would be removed. With it, the NSEC3 + * parameters are stored until they can be used. When the zone has the + * necessary prerequisites for NSEC3, then the INITIAL flag can be cleared, + * and the record will be cleaned up normally. * - * Used to identify NSEC3PARAM records added in this UPDATE request. + * NSEC3PARAM records containing this flag should never be published, but + * if they are, they should be ignored by RFC 5155 compliant nameservers. */ -#define DNS_NSEC3FLAG_UPDATE 0x20U +#define DNS_NSEC3FLAG_INITIAL 0x20U /*% - * Non-standard, NSEC3PARAM only. + * Non-standard, private type only. * * Prevent the creation of a NSEC chain before the last NSEC3 chain * is removed. This will normally only be set when the zone is * transitioning from secure with NSEC3 chains to insecure. + * + * NSEC3PARAM records containing this flag should never be published, + * but if they are, they should be ignored by RFC 5155 compliant + * nameservers. */ #define DNS_NSEC3FLAG_NONSEC 0x10U @@ -2046,6 +2071,37 @@ typedef struct dns_rdata_any_tsig { #endif /* ANY_255_TSIG_250_H */ /* + * Copyright (C) 2011 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_URI_256_H +#define GENERIC_URI_256_H 1 + +/* Id: uri_256.h,v 1.2 2011-03-03 14:10:27 fdupont Exp */ + +typedef struct dns_rdata_uri { + dns_rdatacommon_t common; + isc_mem_t * mctx; + isc_uint16_t priority; + isc_uint16_t weight; + unsigned char * target; + isc_uint16_t tgt_len; +} dns_rdata_uri_t; + +#endif /* GENERIC_URI_256_H */ +/* * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/external/bsd/bind/include/isc/platform.h b/external/bsd/bind/include/isc/platform.h index 57be63ebdda..97457bb20c6 100644 --- a/external/bsd/bind/include/isc/platform.h +++ b/external/bsd/bind/include/isc/platform.h @@ -221,18 +221,22 @@ * the GSSAPI header. */ +#define ISC_PLATFORM_GSSAPIHEADER <gssapi/gssapi.h> /* * Defined to <gssapi_krb5.h> or <gssapi/gssapi_krb5.h> for how to * include the GSSAPI KRB5 header. */ +#define ISC_PLATFORM_GSSAPI_KRB5_HEADER <gssapi/gssapi_krb5.h> + /* * Defined to <krb5.h> or <krb5/krb5.h> for how to include * the KRB5 header. */ +#define ISC_PLATFORM_KRB5HEADER <krb5/krb5.h> /* * Type used for resource limits. |
