[Midnightbsd-cvs] src [9212] trunk/lib/bind: update build for bind 9.9.x

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Nov 5 12:43:52 EDT 2016


Revision: 9212
          http://svnweb.midnightbsd.org/src/?rev=9212
Author:   laffer1
Date:     2016-11-05 12:43:52 -0400 (Sat, 05 Nov 2016)
Log Message:
-----------
update build for bind 9.9.x

Modified Paths:
--------------
    trunk/lib/bind/bind9/Makefile
    trunk/lib/bind/config.h
    trunk/lib/bind/dns/Makefile
    trunk/lib/bind/dns/code.h
    trunk/lib/bind/dns/dns/enumclass.h
    trunk/lib/bind/dns/dns/enumtype.h
    trunk/lib/bind/dns/dns/rdatastruct.h
    trunk/lib/bind/isc/Makefile
    trunk/lib/bind/isc/backtrace-emptytbl.c
    trunk/lib/bind/isc/isc/platform.h
    trunk/lib/bind/isccc/Makefile
    trunk/lib/bind/isccfg/Makefile
    trunk/lib/bind/lwres/Makefile
    trunk/lib/bind/lwres/lwres/netdb.h
    trunk/lib/bind/lwres/lwres/platform.h

Modified: trunk/lib/bind/bind9/Makefile
===================================================================
--- trunk/lib/bind/bind9/Makefile	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/bind9/Makefile	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,9 +1,8 @@
-# $MidnightBSD: src/lib/bind/bind9/Makefile,v 1.6 2010/01/16 16:51:31 laffer1 Exp $
-# $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4.4.1 2005/11/16 07:59:49 ru Exp $
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 
-BIND_DIR=	${.CURDIR}/../../../contrib/bind98
+BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/bind9

Modified: trunk/lib/bind/config.h
===================================================================
--- trunk/lib/bind/config.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/config.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,9 +1,8 @@
-/* $MidnightBSD: src/lib/bind/config.h,v 1.10 2013/01/30 01:55:39 laffer1 Exp $ */
-
+/* $MidnightBSD$
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -19,7 +18,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h,v 1.11 2013-04-02 22:43:24 laffer1 Exp $ */
+/* $Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp $ */
 
 /*! \file */
 
@@ -76,6 +75,9 @@
 /** define if arc4random() exists */
 #define HAVE_ARC4RANDOM 1
 
+/** define if arc4random_addrandom() exists */
+#define HAVE_ARC4RANDOM_ADDRANDOM 1
+
 /**
  * define if pthread_setconcurrency() should be called to tell the
  * OS how many threads we might want to run.
@@ -141,6 +143,9 @@
 /* Define if OpenSSL includes DSA support */
 #define HAVE_OPENSSL_DSA 1
 
+/* Define if OpenSSL includes ECDSA support */
+#define HAVE_OPENSSL_ECDSA 1
+
 /* Define to the length type used by the socket API (socklen_t, size_t, int). */
 #define ISC_SOCKADDR_LEN_T socklen_t
 
@@ -147,6 +152,9 @@
 /* Define if threads need PTHREAD_SCOPE_SYSTEM */
 /* #undef NEED_PTHREAD_SCOPE_SYSTEM */
 
+/* Define to 1 if you have the uname library function. */
+#define HAVE_UNAME 1
+
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
@@ -153,6 +161,9 @@
 /* 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 */
@@ -163,11 +174,15 @@
 /* Define to enable "rrset-order fixed" syntax. */
 /* #undef DNS_RDATASET_FIXED */
 
+/* Define to enable the "fetches-per-server" and "fetches-per-zone" options.
+   */
+/* #undef ENABLE_FETCHLIMIT */
+
 /* Define to enable rpz-nsdname rules. */
-/* #undef ENABLE_RPZ_NSDNAME */
+#define ENABLE_RPZ_NSDNAME 1
 
 /* Define to enable rpz-nsip rules. */
-/* #undef ENABLE_RPZ_NSIP */
+#define ENABLE_RPZ_NSIP 1
 
 /* Solaris hack to get select_large_fdset. */
 /* #undef FD_SETSIZE */
@@ -181,6 +196,9 @@
    MSVC and with C++ compilers. */
 #define FLEXIBLE_ARRAY_MEMBER /**/
 
+/* Define to 1 if the compiler supports __builtin_expect. */
+#define HAVE_BUILTIN_EXPECT 1
+
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
 
@@ -202,6 +220,9 @@
 /* Define to 1 if you have the `EVP_sha256' function. */
 #define HAVE_EVP_SHA256 1
 
+/* Define to 1 if you have the `EVP_sha384' function. */
+#define HAVE_EVP_SHA384 1
+
 /* Define to 1 if you have the `EVP_sha512' function. */
 #define HAVE_EVP_SHA512 1
 
@@ -208,6 +229,15 @@
 /* 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
+
+/* Define to use gperftools CPU profiler. */
+/* #undef HAVE_GPERFTOOLS_PROFILER */
+
 /* Define to 1 if you have the <gssapi/gssapi.h> header file. */
 /* #undef HAVE_GSSAPI_GSSAPI_H */
 
@@ -220,6 +250,9 @@
 /* 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 HAVE_IF_NAMETOINDEX 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -250,6 +283,9 @@
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 /* #undef HAVE_LIBPTHREAD */
 
+/* Define to 1 if you have the `rt' library (-lrt). */
+/* #undef HAVE_LIBRT */
+
 /* Define to 1 if you have the `scf' library (-lscf). */
 /* #undef HAVE_LIBSCF */
 
@@ -265,6 +301,9 @@
 /* Define to 1 if you have the <linux/capability.h> header file. */
 /* #undef HAVE_LINUX_CAPABILITY_H */
 
+/* Define to 1 if you have the <linux/types.h> header file. */
+/* #undef HAVE_LINUX_TYPES_H */
+
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -277,12 +316,30 @@
 /* Define to 1 if you have the <net/if6.h> header file. */
 /* #undef HAVE_NET_IF6_H */
 
+/* Define if your OpenSSL version supports ECDSA. */
+#define HAVE_OPENSSL_ECDSA 1
+
 /* Define if your OpenSSL version supports GOST. */
 /* #undef HAVE_OPENSSL_GOST */
 
+/* Define to 1 if you have the `pthread_yield' function. */
+#define HAVE_PTHREAD_YIELD 1
+
+/* Define to 1 if you have the `pthread_yield_np' function. */
+/* #undef HAVE_PTHREAD_YIELD_NP */
+
+/* Define to 1 if you have the `readline' function. */
+#define HAVE_READLINE 1
+
 /* Define to 1 if you have the <regex.h> header file. */
-/* #undef HAVE_REGEX_H */
+#define HAVE_REGEX_H 1
 
+/* Define to 1 if you have the <sched.h> header file. */
+#define HAVE_SCHED_H 1
+
+/* Define to 1 if you have the `sched_yield' function. */
+#define HAVE_SCHED_YIELD 1
+
 /* Define to 1 if you have the `setegid' function. */
 #define HAVE_SETEGID 1
 
@@ -352,6 +409,12 @@
 /* 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
+
+/* HMAC_*() return ints */
+/* #undef HMAC_RETURN_INT */
+
 /* return type of gai_strerror */
 #define IRS_GAISTRERROR_RETURN_T const char *
 
@@ -361,6 +424,9 @@
 /* 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
 
@@ -375,23 +441,26 @@
    */
 /* #undef NEED_SECURE_DIRECTORY */
 
+/* Use the new XML schema for statistics */
+/* #undef NEWSTATS */
+
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "bind9-bugs at isc.org"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "BIND"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "BIND 9.9"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "bind"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL ""
+#define PACKAGE_URL "https://www.isc.org/downloads/BIND/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "9.9"
 
 /* Sets which flag to pass to open/fcntl to make non-blocking
    (O_NDELAY/O_NONBLOCK). */
@@ -410,6 +479,12 @@
    non-blocking. */
 /* #undef USE_FIONBIO_IOCTL */
 
+/* Enable DNS Response Rate Limiting */
+/* #undef USE_RRL */
+
+/* Define to enable very verbose query trace logging. */
+/* #undef WANT_QUERYTRACE */
+
 /* define if idnkit support is to be included. */
 /* #undef WITH_IDN */
 
@@ -429,7 +504,7 @@
 /* #undef const */
 
 /* Define to empty if your compiler does not support "static inline". */
-#define inline /**/
+/* #undef inline */
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */

Modified: trunk/lib/bind/dns/Makefile
===================================================================
--- trunk/lib/bind/dns/Makefile	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/dns/Makefile	2016-11-05 16:43:52 UTC (rev 9212)
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-BIND_DIR=	${.CURDIR}/../../../contrib/bind98
+BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/dns
@@ -13,7 +13,7 @@
 
 .PATH:		${SRCDIR}
 SRCS+=		acache.c acl.c adb.c byaddr.c \
-		cache.c callbacks.c compress.c \
+		cache.c callbacks.c clientinfo.c compress.c \
 		db.c dbiterator.c dbtable.c diff.c dispatch.c \
 		dlz.c dns64.c dnssec.c ds.c \
 		dst_api.c dst_lib.c dst_parse.c dst_result.c \
@@ -26,13 +26,14 @@
 		name.c ncache.c nsec.c nsec3.c \
 		openssl_link.c openssldh_link.c \
 		openssldsa_link.c opensslgost_link.c opensslrsa_link.c \
+		opensslecdsa_link.c \
 		order.c peer.c portlist.c private.c \
 		rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
 		rdataset.c rdatasetiter.c rdataslab.c request.c \
-		resolver.c result.c rootns.c rpz.c rriterator.c \
+		resolver.c result.c rootns.c rpz.c rriterator.c rrl.c \
 		sdb.c sdlz.c soa.c ssu.c ssu_external.c \
 		stats.c tcpmsg.c time.c timer.c tkey.c \
-		tsec.c tsig.c ttl.c validator.c \
+		tsec.c tsig.c ttl.c update.c validator.c \
 		version.c view.c xfrin.c zone.c zonekey.c zt.c
 
 CFLAGS+=	-I${SRCDIR}/include/dst -I${SRCDIR}/include -I${SRCDIR}
@@ -51,6 +52,7 @@
 		${SRCDIR}/include/dns/cache.h \
 		${SRCDIR}/include/dns/callbacks.h \
 		${SRCDIR}/include/dns/cert.h \
+		${SRCDIR}/include/dns/clientinfo.h \
 		${SRCDIR}/include/dns/compress.h \
 		${SRCDIR}/include/dns/db.h \
 		${SRCDIR}/include/dns/dbiterator.h \
@@ -96,6 +98,7 @@
 		${SRCDIR}/include/dns/resolver.h \
 		${SRCDIR}/include/dns/result.h \
 		${SRCDIR}/include/dns/rootns.h \
+		${SRCDIR}/include/dns/rrl.h \
 		${SRCDIR}/include/dns/sdb.h \
 		${SRCDIR}/include/dns/sdlz.h \
 		${SRCDIR}/include/dns/secalg.h \
@@ -110,6 +113,7 @@
 		${SRCDIR}/include/dns/tsig.h \
 		${SRCDIR}/include/dns/ttl.h \
 		${SRCDIR}/include/dns/types.h \
+		${SRCDIR}/include/dns/update.h \
 		${SRCDIR}/include/dns/validator.h \
 		${SRCDIR}/include/dns/version.h \
 		${SRCDIR}/include/dns/view.h \

Modified: trunk/lib/bind/dns/code.h
===================================================================
--- trunk/lib/bind/dns/code.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/dns/code.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,7 +1,7 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
 
 /*
- * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -67,11 +67,12 @@
 #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"
 #include "rdata/generic/dname_39.c"
+#include "rdata/generic/sink_40.c"
 #include "rdata/generic/opt_41.c"
 #include "rdata/in_1/apl_42.c"
 #include "rdata/generic/ds_43.c"
@@ -84,11 +85,29 @@
 #include "rdata/generic/nsec3_50.c"
 #include "rdata/generic/nsec3param_51.c"
 #include "rdata/generic/tlsa_52.c"
+#include "rdata/generic/smimea_53.c"
 #include "rdata/generic/hip_55.c"
+#include "rdata/generic/ninfo_56.c"
+#include "rdata/generic/rkey_57.c"
+#include "rdata/generic/talink_58.c"
+#include "rdata/generic/cds_59.c"
+#include "rdata/generic/cdnskey_60.c"
+#include "rdata/generic/openpgpkey_61.c"
+#include "rdata/generic/csync_62.c"
 #include "rdata/generic/spf_99.c"
 #include "rdata/generic/unspec_103.c"
+#include "rdata/generic/nid_104.c"
+#include "rdata/generic/l32_105.c"
+#include "rdata/generic/l64_106.c"
+#include "rdata/generic/lp_107.c"
+#include "rdata/generic/eui48_108.c"
+#include "rdata/generic/eui64_109.c"
 #include "rdata/generic/tkey_249.c"
 #include "rdata/any_255/tsig_250.c"
+#include "rdata/generic/uri_256.c"
+#include "rdata/generic/caa_257.c"
+#include "rdata/generic/avc_258.c"
+#include "rdata/generic/ta_32768.c"
 #include "rdata/generic/dlv_32769.c"
 #include "rdata/generic/keydata_65533.c"
 
@@ -157,11 +176,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; \
@@ -174,6 +189,7 @@
 		} \
 		break; \
 	case 39: result = fromtext_dname(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 40: result = fromtext_sink(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 41: result = fromtext_opt(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 42: switch (rdclass) { \
 		case 1: result = fromtext_in_apl(rdclass, type, lexer, origin, options, target, callbacks); break; \
@@ -194,9 +210,23 @@
 	case 50: result = fromtext_nsec3(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 51: result = fromtext_nsec3param(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 52: result = fromtext_tlsa(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 53: result = fromtext_smimea(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 55: result = fromtext_hip(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 56: result = fromtext_ninfo(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 57: result = fromtext_rkey(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 58: result = fromtext_talink(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 62: result = fromtext_csync(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; \
+	case 105: result = fromtext_l32(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 106: result = fromtext_l64(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 107: result = fromtext_lp(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 108: result = fromtext_eui48(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 109: result = fromtext_eui64(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 249: result = fromtext_tkey(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = fromtext_any_tsig(rdclass, type, lexer, origin, options, target, callbacks); break; \
@@ -203,6 +233,10 @@
 		default: result = DNS_R_UNKNOWN; break; \
 		} \
 		break; \
+	case 256: result = fromtext_uri(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 257: result = fromtext_caa(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 258: result = fromtext_avc(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 32768: result = fromtext_ta(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; \
@@ -271,11 +305,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; \
@@ -288,6 +318,7 @@
 		} \
 		break; \
 	case 39: result = totext_dname(rdata, tctx, target); break; \
+	case 40: result = totext_sink(rdata, tctx, target); break; \
 	case 41: result = totext_opt(rdata, tctx, target); break; \
 	case 42: switch (rdata->rdclass) { \
 		case 1: result = totext_in_apl(rdata, tctx, target); break; \
@@ -308,9 +339,23 @@
 	case 50: result = totext_nsec3(rdata, tctx, target); break; \
 	case 51: result = totext_nsec3param(rdata, tctx, target); break; \
 	case 52: result = totext_tlsa(rdata, tctx, target); break; \
+	case 53: result = totext_smimea(rdata, tctx, target); break; \
 	case 55: result = totext_hip(rdata, tctx, target); break; \
+	case 56: result = totext_ninfo(rdata, tctx, target); break; \
+	case 57: result = totext_rkey(rdata, tctx, target); break; \
+	case 58: result = totext_talink(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 62: result = totext_csync(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; \
+	case 105: result = totext_l32(rdata, tctx, target); break; \
+	case 106: result = totext_l64(rdata, tctx, target); break; \
+	case 107: result = totext_lp(rdata, tctx, target); break; \
+	case 108: result = totext_eui48(rdata, tctx, target); break; \
+	case 109: result = totext_eui64(rdata, tctx, target); break; \
 	case 249: result = totext_tkey(rdata, tctx, target); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = totext_any_tsig(rdata, tctx, target); break; \
@@ -317,6 +362,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = totext_uri(rdata, tctx, target); break; \
+	case 257: result = totext_caa(rdata, tctx, target); break; \
+	case 258: result = totext_avc(rdata, tctx, target); break; \
+	case 32768: result = totext_ta(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; \
@@ -385,11 +434,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; \
@@ -402,6 +447,7 @@
 		} \
 		break; \
 	case 39: result = fromwire_dname(rdclass, type, source, dctx, options, target); break; \
+	case 40: result = fromwire_sink(rdclass, type, source, dctx, options, target); break; \
 	case 41: result = fromwire_opt(rdclass, type, source, dctx, options, target); break; \
 	case 42: switch (rdclass) { \
 		case 1: result = fromwire_in_apl(rdclass, type, source, dctx, options, target); break; \
@@ -422,9 +468,23 @@
 	case 50: result = fromwire_nsec3(rdclass, type, source, dctx, options, target); break; \
 	case 51: result = fromwire_nsec3param(rdclass, type, source, dctx, options, target); break; \
 	case 52: result = fromwire_tlsa(rdclass, type, source, dctx, options, target); break; \
+	case 53: result = fromwire_smimea(rdclass, type, source, dctx, options, target); break; \
 	case 55: result = fromwire_hip(rdclass, type, source, dctx, options, target); break; \
+	case 56: result = fromwire_ninfo(rdclass, type, source, dctx, options, target); break; \
+	case 57: result = fromwire_rkey(rdclass, type, source, dctx, options, target); break; \
+	case 58: result = fromwire_talink(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 62: result = fromwire_csync(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; \
+	case 105: result = fromwire_l32(rdclass, type, source, dctx, options, target); break; \
+	case 106: result = fromwire_l64(rdclass, type, source, dctx, options, target); break; \
+	case 107: result = fromwire_lp(rdclass, type, source, dctx, options, target); break; \
+	case 108: result = fromwire_eui48(rdclass, type, source, dctx, options, target); break; \
+	case 109: result = fromwire_eui64(rdclass, type, source, dctx, options, target); break; \
 	case 249: result = fromwire_tkey(rdclass, type, source, dctx, options, target); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = fromwire_any_tsig(rdclass, type, source, dctx, options, target); break; \
@@ -431,6 +491,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = fromwire_uri(rdclass, type, source, dctx, options, target); break; \
+	case 257: result = fromwire_caa(rdclass, type, source, dctx, options, target); break; \
+	case 258: result = fromwire_avc(rdclass, type, source, dctx, options, target); break; \
+	case 32768: result = fromwire_ta(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; \
@@ -499,11 +563,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; \
@@ -516,6 +576,7 @@
 		} \
 		break; \
 	case 39: result = towire_dname(rdata, cctx, target); break; \
+	case 40: result = towire_sink(rdata, cctx, target); break; \
 	case 41: result = towire_opt(rdata, cctx, target); break; \
 	case 42: switch (rdata->rdclass) { \
 		case 1: result = towire_in_apl(rdata, cctx, target); break; \
@@ -536,9 +597,23 @@
 	case 50: result = towire_nsec3(rdata, cctx, target); break; \
 	case 51: result = towire_nsec3param(rdata, cctx, target); break; \
 	case 52: result = towire_tlsa(rdata, cctx, target); break; \
+	case 53: result = towire_smimea(rdata, cctx, target); break; \
 	case 55: result = towire_hip(rdata, cctx, target); break; \
+	case 56: result = towire_ninfo(rdata, cctx, target); break; \
+	case 57: result = towire_rkey(rdata, cctx, target); break; \
+	case 58: result = towire_talink(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 62: result = towire_csync(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; \
+	case 105: result = towire_l32(rdata, cctx, target); break; \
+	case 106: result = towire_l64(rdata, cctx, target); break; \
+	case 107: result = towire_lp(rdata, cctx, target); break; \
+	case 108: result = towire_eui48(rdata, cctx, target); break; \
+	case 109: result = towire_eui64(rdata, cctx, target); break; \
 	case 249: result = towire_tkey(rdata, cctx, target); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = towire_any_tsig(rdata, cctx, target); break; \
@@ -545,6 +620,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = towire_uri(rdata, cctx, target); break; \
+	case 257: result = towire_caa(rdata, cctx, target); break; \
+	case 258: result = towire_avc(rdata, cctx, target); break; \
+	case 32768: result = towire_ta(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; \
@@ -613,11 +692,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; \
@@ -630,6 +705,7 @@
 		} \
 		break; \
 	case 39: result = compare_dname(rdata1, rdata2); break; \
+	case 40: result = compare_sink(rdata1, rdata2); break; \
 	case 41: result = compare_opt(rdata1, rdata2); break; \
 	case 42: switch (rdata1->rdclass) { \
 		case 1: result = compare_in_apl(rdata1, rdata2); break; \
@@ -650,9 +726,23 @@
 	case 50: result = compare_nsec3(rdata1, rdata2); break; \
 	case 51: result = compare_nsec3param(rdata1, rdata2); break; \
 	case 52: result = compare_tlsa(rdata1, rdata2); break; \
+	case 53: result = compare_smimea(rdata1, rdata2); break; \
 	case 55: result = compare_hip(rdata1, rdata2); break; \
+	case 56: result = compare_ninfo(rdata1, rdata2); break; \
+	case 57: result = compare_rkey(rdata1, rdata2); break; \
+	case 58: result = compare_talink(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 62: result = compare_csync(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; \
+	case 105: result = compare_l32(rdata1, rdata2); break; \
+	case 106: result = compare_l64(rdata1, rdata2); break; \
+	case 107: result = compare_lp(rdata1, rdata2); break; \
+	case 108: result = compare_eui48(rdata1, rdata2); break; \
+	case 109: result = compare_eui64(rdata1, rdata2); break; \
 	case 249: result = compare_tkey(rdata1, rdata2); break; \
 	case 250: switch (rdata1->rdclass) { \
 		case 255: result = compare_any_tsig(rdata1, rdata2); break; \
@@ -659,6 +749,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = compare_uri(rdata1, rdata2); break; \
+	case 257: result = compare_caa(rdata1, rdata2); break; \
+	case 258: result = compare_avc(rdata1, rdata2); break; \
+	case 32768: result = compare_ta(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; \
@@ -727,11 +821,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; \
@@ -744,6 +834,7 @@
 		} \
 		break; \
 	case 39: result = casecompare_dname(rdata1, rdata2); break; \
+	case 40: result = casecompare_sink(rdata1, rdata2); break; \
 	case 41: result = casecompare_opt(rdata1, rdata2); break; \
 	case 42: switch (rdata1->rdclass) { \
 		case 1: result = casecompare_in_apl(rdata1, rdata2); break; \
@@ -764,9 +855,23 @@
 	case 50: result = casecompare_nsec3(rdata1, rdata2); break; \
 	case 51: result = casecompare_nsec3param(rdata1, rdata2); break; \
 	case 52: result = casecompare_tlsa(rdata1, rdata2); break; \
+	case 53: result = casecompare_smimea(rdata1, rdata2); break; \
 	case 55: result = casecompare_hip(rdata1, rdata2); break; \
+	case 56: result = casecompare_ninfo(rdata1, rdata2); break; \
+	case 57: result = casecompare_rkey(rdata1, rdata2); break; \
+	case 58: result = casecompare_talink(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 62: result = casecompare_csync(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; \
+	case 105: result = casecompare_l32(rdata1, rdata2); break; \
+	case 106: result = casecompare_l64(rdata1, rdata2); break; \
+	case 107: result = casecompare_lp(rdata1, rdata2); break; \
+	case 108: result = casecompare_eui48(rdata1, rdata2); break; \
+	case 109: result = casecompare_eui64(rdata1, rdata2); break; \
 	case 249: result = casecompare_tkey(rdata1, rdata2); break; \
 	case 250: switch (rdata1->rdclass) { \
 		case 255: result = casecompare_any_tsig(rdata1, rdata2); break; \
@@ -773,6 +878,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = casecompare_uri(rdata1, rdata2); break; \
+	case 257: result = casecompare_caa(rdata1, rdata2); break; \
+	case 258: result = casecompare_avc(rdata1, rdata2); break; \
+	case 32768: result = casecompare_ta(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; \
@@ -841,11 +950,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; \
@@ -858,6 +963,7 @@
 		} \
 		break; \
 	case 39: result = fromstruct_dname(rdclass, type, source, target); break; \
+	case 40: result = fromstruct_sink(rdclass, type, source, target); break; \
 	case 41: result = fromstruct_opt(rdclass, type, source, target); break; \
 	case 42: switch (rdclass) { \
 		case 1: result = fromstruct_in_apl(rdclass, type, source, target); break; \
@@ -878,9 +984,23 @@
 	case 50: result = fromstruct_nsec3(rdclass, type, source, target); break; \
 	case 51: result = fromstruct_nsec3param(rdclass, type, source, target); break; \
 	case 52: result = fromstruct_tlsa(rdclass, type, source, target); break; \
+	case 53: result = fromstruct_smimea(rdclass, type, source, target); break; \
 	case 55: result = fromstruct_hip(rdclass, type, source, target); break; \
+	case 56: result = fromstruct_ninfo(rdclass, type, source, target); break; \
+	case 57: result = fromstruct_rkey(rdclass, type, source, target); break; \
+	case 58: result = fromstruct_talink(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 62: result = fromstruct_csync(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; \
+	case 105: result = fromstruct_l32(rdclass, type, source, target); break; \
+	case 106: result = fromstruct_l64(rdclass, type, source, target); break; \
+	case 107: result = fromstruct_lp(rdclass, type, source, target); break; \
+	case 108: result = fromstruct_eui48(rdclass, type, source, target); break; \
+	case 109: result = fromstruct_eui64(rdclass, type, source, target); break; \
 	case 249: result = fromstruct_tkey(rdclass, type, source, target); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = fromstruct_any_tsig(rdclass, type, source, target); break; \
@@ -887,6 +1007,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = fromstruct_uri(rdclass, type, source, target); break; \
+	case 257: result = fromstruct_caa(rdclass, type, source, target); break; \
+	case 258: result = fromstruct_avc(rdclass, type, source, target); break; \
+	case 32768: result = fromstruct_ta(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; \
@@ -955,11 +1079,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; \
@@ -972,6 +1092,7 @@
 		} \
 		break; \
 	case 39: result = tostruct_dname(rdata, target, mctx); break; \
+	case 40: result = tostruct_sink(rdata, target, mctx); break; \
 	case 41: result = tostruct_opt(rdata, target, mctx); break; \
 	case 42: switch (rdata->rdclass) { \
 		case 1: result = tostruct_in_apl(rdata, target, mctx); break; \
@@ -992,9 +1113,23 @@
 	case 50: result = tostruct_nsec3(rdata, target, mctx); break; \
 	case 51: result = tostruct_nsec3param(rdata, target, mctx); break; \
 	case 52: result = tostruct_tlsa(rdata, target, mctx); break; \
+	case 53: result = tostruct_smimea(rdata, target, mctx); break; \
 	case 55: result = tostruct_hip(rdata, target, mctx); break; \
+	case 56: result = tostruct_ninfo(rdata, target, mctx); break; \
+	case 57: result = tostruct_rkey(rdata, target, mctx); break; \
+	case 58: result = tostruct_talink(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 62: result = tostruct_csync(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; \
+	case 105: result = tostruct_l32(rdata, target, mctx); break; \
+	case 106: result = tostruct_l64(rdata, target, mctx); break; \
+	case 107: result = tostruct_lp(rdata, target, mctx); break; \
+	case 108: result = tostruct_eui48(rdata, target, mctx); break; \
+	case 109: result = tostruct_eui64(rdata, target, mctx); break; \
 	case 249: result = tostruct_tkey(rdata, target, mctx); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = tostruct_any_tsig(rdata, target, mctx); break; \
@@ -1001,6 +1136,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = tostruct_uri(rdata, target, mctx); break; \
+	case 257: result = tostruct_caa(rdata, target, mctx); break; \
+	case 258: result = tostruct_avc(rdata, target, mctx); break; \
+	case 32768: result = tostruct_ta(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; \
@@ -1069,11 +1208,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; \
@@ -1086,6 +1221,7 @@
 		} \
 		break; \
 	case 39: freestruct_dname(source); break; \
+	case 40: freestruct_sink(source); break; \
 	case 41: freestruct_opt(source); break; \
 	case 42: switch (common->rdclass) { \
 		case 1: freestruct_in_apl(source); break; \
@@ -1106,9 +1242,23 @@
 	case 50: freestruct_nsec3(source); break; \
 	case 51: freestruct_nsec3param(source); break; \
 	case 52: freestruct_tlsa(source); break; \
+	case 53: freestruct_smimea(source); break; \
 	case 55: freestruct_hip(source); break; \
+	case 56: freestruct_ninfo(source); break; \
+	case 57: freestruct_rkey(source); break; \
+	case 58: freestruct_talink(source); break; \
+	case 59: freestruct_cds(source); break; \
+	case 60: freestruct_cdnskey(source); break; \
+	case 61: freestruct_openpgpkey(source); break; \
+	case 62: freestruct_csync(source); break; \
 	case 99: freestruct_spf(source); break; \
 	case 103: freestruct_unspec(source); break; \
+	case 104: freestruct_nid(source); break; \
+	case 105: freestruct_l32(source); break; \
+	case 106: freestruct_l64(source); break; \
+	case 107: freestruct_lp(source); break; \
+	case 108: freestruct_eui48(source); break; \
+	case 109: freestruct_eui64(source); break; \
 	case 249: freestruct_tkey(source); break; \
 	case 250: switch (common->rdclass) { \
 		case 255: freestruct_any_tsig(source); break; \
@@ -1115,6 +1265,10 @@
 		default: break; \
 		} \
 		break; \
+	case 256: freestruct_uri(source); break; \
+	case 257: freestruct_caa(source); break; \
+	case 258: freestruct_avc(source); break; \
+	case 32768: freestruct_ta(source); break; \
 	case 32769: freestruct_dlv(source); break; \
 	case 65533: freestruct_keydata(source); break; \
 	default: break; \
@@ -1183,11 +1337,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; \
@@ -1200,6 +1350,7 @@
 		} \
 		break; \
 	case 39: result = additionaldata_dname(rdata, add, arg); break; \
+	case 40: result = additionaldata_sink(rdata, add, arg); break; \
 	case 41: result = additionaldata_opt(rdata, add, arg); break; \
 	case 42: switch (rdata->rdclass) { \
 		case 1: result = additionaldata_in_apl(rdata, add, arg); break; \
@@ -1220,9 +1371,23 @@
 	case 50: result = additionaldata_nsec3(rdata, add, arg); break; \
 	case 51: result = additionaldata_nsec3param(rdata, add, arg); break; \
 	case 52: result = additionaldata_tlsa(rdata, add, arg); break; \
+	case 53: result = additionaldata_smimea(rdata, add, arg); break; \
 	case 55: result = additionaldata_hip(rdata, add, arg); break; \
+	case 56: result = additionaldata_ninfo(rdata, add, arg); break; \
+	case 57: result = additionaldata_rkey(rdata, add, arg); break; \
+	case 58: result = additionaldata_talink(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 62: result = additionaldata_csync(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; \
+	case 105: result = additionaldata_l32(rdata, add, arg); break; \
+	case 106: result = additionaldata_l64(rdata, add, arg); break; \
+	case 107: result = additionaldata_lp(rdata, add, arg); break; \
+	case 108: result = additionaldata_eui48(rdata, add, arg); break; \
+	case 109: result = additionaldata_eui64(rdata, add, arg); break; \
 	case 249: result = additionaldata_tkey(rdata, add, arg); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = additionaldata_any_tsig(rdata, add, arg); break; \
@@ -1229,6 +1394,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = additionaldata_uri(rdata, add, arg); break; \
+	case 257: result = additionaldata_caa(rdata, add, arg); break; \
+	case 258: result = additionaldata_avc(rdata, add, arg); break; \
+	case 32768: result = additionaldata_ta(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; \
@@ -1297,11 +1466,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; \
@@ -1314,6 +1479,7 @@
 		} \
 		break; \
 	case 39: result = digest_dname(rdata, digest, arg); break; \
+	case 40: result = digest_sink(rdata, digest, arg); break; \
 	case 41: result = digest_opt(rdata, digest, arg); break; \
 	case 42: switch (rdata->rdclass) { \
 		case 1: result = digest_in_apl(rdata, digest, arg); break; \
@@ -1334,9 +1500,23 @@
 	case 50: result = digest_nsec3(rdata, digest, arg); break; \
 	case 51: result = digest_nsec3param(rdata, digest, arg); break; \
 	case 52: result = digest_tlsa(rdata, digest, arg); break; \
+	case 53: result = digest_smimea(rdata, digest, arg); break; \
 	case 55: result = digest_hip(rdata, digest, arg); break; \
+	case 56: result = digest_ninfo(rdata, digest, arg); break; \
+	case 57: result = digest_rkey(rdata, digest, arg); break; \
+	case 58: result = digest_talink(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 62: result = digest_csync(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; \
+	case 105: result = digest_l32(rdata, digest, arg); break; \
+	case 106: result = digest_l64(rdata, digest, arg); break; \
+	case 107: result = digest_lp(rdata, digest, arg); break; \
+	case 108: result = digest_eui48(rdata, digest, arg); break; \
+	case 109: result = digest_eui64(rdata, digest, arg); break; \
 	case 249: result = digest_tkey(rdata, digest, arg); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = digest_any_tsig(rdata, digest, arg); break; \
@@ -1343,6 +1523,10 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = digest_uri(rdata, digest, arg); break; \
+	case 257: result = digest_caa(rdata, digest, arg); break; \
+	case 258: result = digest_avc(rdata, digest, arg); break; \
+	case 32768: result = digest_ta(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; \
@@ -1411,11 +1595,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; \
@@ -1428,6 +1608,7 @@
 		} \
 		break; \
 	case 39: result = checkowner_dname(name, rdclass, type, wildcard); break; \
+	case 40: result = checkowner_sink(name, rdclass, type, wildcard); break; \
 	case 41: result = checkowner_opt(name, rdclass, type, wildcard); break; \
 	case 42: switch (rdclass) { \
 		case 1: result = checkowner_in_apl(name, rdclass, type, wildcard); break; \
@@ -1448,9 +1629,23 @@
 	case 50: result = checkowner_nsec3(name, rdclass, type, wildcard); break; \
 	case 51: result = checkowner_nsec3param(name, rdclass, type, wildcard); break; \
 	case 52: result = checkowner_tlsa(name, rdclass, type, wildcard); break; \
+	case 53: result = checkowner_smimea(name, rdclass, type, wildcard); break; \
 	case 55: result = checkowner_hip(name, rdclass, type, wildcard); break; \
+	case 56: result = checkowner_ninfo(name, rdclass, type, wildcard); break; \
+	case 57: result = checkowner_rkey(name, rdclass, type, wildcard); break; \
+	case 58: result = checkowner_talink(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 62: result = checkowner_csync(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; \
+	case 105: result = checkowner_l32(name, rdclass, type, wildcard); break; \
+	case 106: result = checkowner_l64(name, rdclass, type, wildcard); break; \
+	case 107: result = checkowner_lp(name, rdclass, type, wildcard); break; \
+	case 108: result = checkowner_eui48(name, rdclass, type, wildcard); break; \
+	case 109: result = checkowner_eui64(name, rdclass, type, wildcard); break; \
 	case 249: result = checkowner_tkey(name, rdclass, type, wildcard); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = checkowner_any_tsig(name, rdclass, type, wildcard); break; \
@@ -1457,6 +1652,10 @@
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = checkowner_uri(name, rdclass, type, wildcard); break; \
+	case 257: result = checkowner_caa(name, rdclass, type, wildcard); break; \
+	case 258: result = checkowner_avc(name, rdclass, type, wildcard); break; \
+	case 32768: result = checkowner_ta(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; \
@@ -1525,11 +1724,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; \
@@ -1542,6 +1737,7 @@
 		} \
 		break; \
 	case 39: result = checknames_dname(rdata, owner, bad); break; \
+	case 40: result = checknames_sink(rdata, owner, bad); break; \
 	case 41: result = checknames_opt(rdata, owner, bad); break; \
 	case 42: switch (rdata->rdclass) { \
 		case 1: result = checknames_in_apl(rdata, owner, bad); break; \
@@ -1562,9 +1758,23 @@
 	case 50: result = checknames_nsec3(rdata, owner, bad); break; \
 	case 51: result = checknames_nsec3param(rdata, owner, bad); break; \
 	case 52: result = checknames_tlsa(rdata, owner, bad); break; \
+	case 53: result = checknames_smimea(rdata, owner, bad); break; \
 	case 55: result = checknames_hip(rdata, owner, bad); break; \
+	case 56: result = checknames_ninfo(rdata, owner, bad); break; \
+	case 57: result = checknames_rkey(rdata, owner, bad); break; \
+	case 58: result = checknames_talink(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 62: result = checknames_csync(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; \
+	case 105: result = checknames_l32(rdata, owner, bad); break; \
+	case 106: result = checknames_l64(rdata, owner, bad); break; \
+	case 107: result = checknames_lp(rdata, owner, bad); break; \
+	case 108: result = checknames_eui48(rdata, owner, bad); break; \
+	case 109: result = checknames_eui64(rdata, owner, bad); break; \
 	case 249: result = checknames_tkey(rdata, owner, bad); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = checknames_any_tsig(rdata, owner, bad); break; \
@@ -1571,6 +1781,10 @@
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = checknames_uri(rdata, owner, bad); break; \
+	case 257: result = checknames_caa(rdata, owner, bad); break; \
+	case 258: result = checknames_avc(rdata, owner, bad); break; \
+	case 32768: result = checknames_ta(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; \
@@ -1609,6 +1823,7 @@
 			break; \
 		case 182: \
 			RDATATYPE_COMPARE("soa", 6, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("ta", 32768, _typename, _length, _typep); \
 			break; \
 		case 126: \
 			RDATATYPE_COMPARE("mb", 7, _typename, _length, _typep); \
@@ -1659,6 +1874,7 @@
 			break; \
 		case 140: \
 			RDATATYPE_COMPARE("nsap-ptr", 23, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("l64", 106, _typename, _length, _typep); \
 			break; \
 		case 122: \
 			RDATATYPE_COMPARE("sig", 24, _typename, _length, _typep); \
@@ -1666,6 +1882,7 @@
 			break; \
 		case 254: \
 			RDATATYPE_COMPARE("key", 25, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("talink", 58, _typename, _length, _typep); \
 			break; \
 		case 112: \
 			RDATATYPE_COMPARE("px", 26, _typename, _length, _typep); \
@@ -1694,6 +1911,7 @@
 			break; \
 		case 172: \
 			RDATATYPE_COMPARE("cert", 37, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("avc", 258, _typename, _length, _typep); \
 			break; \
 		case 226: \
 			RDATATYPE_COMPARE("a6", 38, _typename, _length, _typep); \
@@ -1701,14 +1919,19 @@
 		case 109: \
 			RDATATYPE_COMPARE("dname", 39, _typename, _length, _typep); \
 			break; \
+		case 189: \
+			RDATATYPE_COMPARE("sink", 40, _typename, _length, _typep); \
+			break; \
 		case 168: \
 			RDATATYPE_COMPARE("opt", 41, _typename, _length, _typep); \
 			break; \
 		case 48: \
 			RDATATYPE_COMPARE("apl", 42, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("eui48", 108, _typename, _length, _typep); \
 			break; \
 		case 210: \
 			RDATATYPE_COMPARE("ds", 43, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("cds", 59, _typename, _length, _typep); \
 			break; \
 		case 128: \
 			RDATATYPE_COMPARE("sshfp", 44, _typename, _length, _typep); \
@@ -1724,6 +1947,7 @@
 			break; \
 		case 26: \
 			RDATATYPE_COMPARE("dnskey", 48, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("cdnskey", 60, _typename, _length, _typep); \
 			break; \
 		case 4: \
 			RDATATYPE_COMPARE("dhcid", 49, _typename, _length, _typep); \
@@ -1735,9 +1959,25 @@
 		case 120: \
 			RDATATYPE_COMPARE("tlsa", 52, _typename, _length, _typep); \
 			break; \
+		case 217: \
+			RDATATYPE_COMPARE("smimea", 53, _typename, _length, _typep); \
+			break; \
 		case 208: \
 			RDATATYPE_COMPARE("hip", 55, _typename, _length, _typep); \
 			break; \
+		case 221: \
+			RDATATYPE_COMPARE("ninfo", 56, _typename, _length, _typep); \
+			break; \
+		case 198: \
+			RDATATYPE_COMPARE("rkey", 57, _typename, _length, _typep); \
+			break; \
+		case 49: \
+			RDATATYPE_COMPARE("openpgpkey", 61, _typename, _length, _typep); \
+			break; \
+		case 56: \
+			RDATATYPE_COMPARE("csync", 62, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("uri", 256, _typename, _length, _typep); \
+			break; \
 		case 230: \
 			RDATATYPE_COMPARE("uinfo", 100, _typename, _length, _typep); \
 			break; \
@@ -1747,6 +1987,18 @@
 		case 145: \
 			RDATATYPE_COMPARE("unspec", 103, _typename, _length, _typep); \
 			break; \
+		case 36: \
+			RDATATYPE_COMPARE("nid", 104, _typename, _length, _typep); \
+			break; \
+		case 174: \
+			RDATATYPE_COMPARE("l32", 105, _typename, _length, _typep); \
+			break; \
+		case 32: \
+			RDATATYPE_COMPARE("lp", 107, _typename, _length, _typep); \
+			break; \
+		case 136: \
+			RDATATYPE_COMPARE("eui64", 109, _typename, _length, _typep); \
+			break; \
 		case 184: \
 			RDATATYPE_COMPARE("tkey", 249, _typename, _length, _typep); \
 			break; \
@@ -1769,6 +2021,9 @@
 		case 68: \
 			RDATATYPE_COMPARE("any", 255, _typename, _length, _typep); \
 			break; \
+		case 166: \
+			RDATATYPE_COMPARE("caa", 257, _typename, _length, _typep); \
+			break; \
 	}
 #define RDATATYPE_ATTRIBUTE_SW \
 	switch (type) { \
@@ -1812,6 +2067,7 @@
 	case 37: return (RRTYPE_CERT_ATTRIBUTES); \
 	case 38: return (RRTYPE_A6_ATTRIBUTES); \
 	case 39: return (RRTYPE_DNAME_ATTRIBUTES); \
+	case 40: return (RRTYPE_SINK_ATTRIBUTES); \
 	case 41: return (RRTYPE_OPT_ATTRIBUTES); \
 	case 42: return (RRTYPE_APL_ATTRIBUTES); \
 	case 43: return (RRTYPE_DS_ATTRIBUTES); \
@@ -1824,12 +2080,26 @@
 	case 50: return (RRTYPE_NSEC3_ATTRIBUTES); \
 	case 51: return (RRTYPE_NSEC3PARAM_ATTRIBUTES); \
 	case 52: return (RRTYPE_TLSA_ATTRIBUTES); \
+	case 53: return (RRTYPE_SMIMEA_ATTRIBUTES); \
 	case 55: return (RRTYPE_HIP_ATTRIBUTES); \
+	case 56: return (RRTYPE_NINFO_ATTRIBUTES); \
+	case 57: return (RRTYPE_RKEY_ATTRIBUTES); \
+	case 58: return (RRTYPE_TALINK_ATTRIBUTES); \
+	case 59: return (RRTYPE_CDS_ATTRIBUTES); \
+	case 60: return (RRTYPE_CDNSKEY_ATTRIBUTES); \
+	case 61: return (RRTYPE_OPENPGPKEY_ATTRIBUTES); \
+	case 62: return (RRTYPE_CSYNC_ATTRIBUTES); \
 	case 99: return (RRTYPE_SPF_ATTRIBUTES); \
 	case 100: return (DNS_RDATATYPEATTR_RESERVED); \
 	case 101: return (DNS_RDATATYPEATTR_RESERVED); \
 	case 102: return (DNS_RDATATYPEATTR_RESERVED); \
 	case 103: return (RRTYPE_UNSPEC_ATTRIBUTES); \
+	case 104: return (RRTYPE_NID_ATTRIBUTES); \
+	case 105: return (RRTYPE_L32_ATTRIBUTES); \
+	case 106: return (RRTYPE_L64_ATTRIBUTES); \
+	case 107: return (RRTYPE_LP_ATTRIBUTES); \
+	case 108: return (RRTYPE_EUI48_ATTRIBUTES); \
+	case 109: return (RRTYPE_EUI64_ATTRIBUTES); \
 	case 249: return (RRTYPE_TKEY_ATTRIBUTES); \
 	case 250: return (RRTYPE_TSIG_ATTRIBUTES); \
 	case 251: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
@@ -1837,6 +2107,10 @@
 	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 257: return (RRTYPE_CAA_ATTRIBUTES); \
+	case 258: return (RRTYPE_AVC_ATTRIBUTES); \
+	case 32768: return (RRTYPE_TA_ATTRIBUTES); \
 	case 32769: return (RRTYPE_DLV_ATTRIBUTES); \
 	case 65533: return (RRTYPE_KEYDATA_ATTRIBUTES); \
 	}
@@ -1882,6 +2156,7 @@
 	case 37: return (str_totext("CERT", target)); \
 	case 38: return (str_totext("A6", target)); \
 	case 39: return (str_totext("DNAME", target)); \
+	case 40: return (str_totext("SINK", target)); \
 	case 41: return (str_totext("OPT", target)); \
 	case 42: return (str_totext("APL", target)); \
 	case 43: return (str_totext("DS", target)); \
@@ -1894,12 +2169,26 @@
 	case 50: return (str_totext("NSEC3", target)); \
 	case 51: return (str_totext("NSEC3PARAM", target)); \
 	case 52: return (str_totext("TLSA", target)); \
+	case 53: return (str_totext("SMIMEA", target)); \
 	case 55: return (str_totext("HIP", target)); \
+	case 56: return (str_totext("NINFO", target)); \
+	case 57: return (str_totext("RKEY", target)); \
+	case 58: return (str_totext("TALINK", target)); \
+	case 59: return (str_totext("CDS", target)); \
+	case 60: return (str_totext("CDNSKEY", target)); \
+	case 61: return (str_totext("OPENPGPKEY", target)); \
+	case 62: return (str_totext("CSYNC", target)); \
 	case 99: return (str_totext("SPF", target)); \
 	case 100: return (str_totext("UINFO", target)); \
 	case 101: return (str_totext("UID", target)); \
 	case 102: return (str_totext("GID", target)); \
 	case 103: return (str_totext("UNSPEC", target)); \
+	case 104: return (str_totext("NID", target)); \
+	case 105: return (str_totext("L32", target)); \
+	case 106: return (str_totext("L64", target)); \
+	case 107: return (str_totext("LP", target)); \
+	case 108: return (str_totext("EUI48", target)); \
+	case 109: return (str_totext("EUI64", target)); \
 	case 249: return (str_totext("TKEY", target)); \
 	case 250: return (str_totext("TSIG", target)); \
 	case 251: return (str_totext("IXFR", target)); \
@@ -1907,7 +2196,10 @@
 	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 257: return (str_totext("CAA", target)); \
+	case 258: return (str_totext("AVC", target)); \
+	case 32768: return (str_totext("TA", target)); \
 	case 32769: return (str_totext("DLV", target)); \
-	case 65533: return (str_totext("KEYDATA", target)); \
 	}
 #endif /* DNS_CODE_H */

Modified: trunk/lib/bind/dns/dns/enumclass.h
===================================================================
--- trunk/lib/bind/dns/dns/enumclass.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/dns/dns/enumclass.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,7 +1,6 @@
 /* $MidnightBSD$ */
-
 /*
- * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any

Modified: trunk/lib/bind/dns/dns/enumtype.h
===================================================================
--- trunk/lib/bind/dns/dns/enumtype.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/dns/dns/enumtype.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,7 +1,7 @@
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/9/lib/bind/dns/dns/enumtype.h 306394 2016-09-28 06:11:01Z delphij $ */
 
 /*
- * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -67,6 +67,7 @@
 	dns_rdatatype_cert = 37,
 	dns_rdatatype_a6 = 38,
 	dns_rdatatype_dname = 39,
+	dns_rdatatype_sink = 40,
 	dns_rdatatype_opt = 41,
 	dns_rdatatype_apl = 42,
 	dns_rdatatype_ds = 43,
@@ -79,11 +80,29 @@
 	dns_rdatatype_nsec3 = 50,
 	dns_rdatatype_nsec3param = 51,
 	dns_rdatatype_tlsa = 52,
+	dns_rdatatype_smimea = 53,
 	dns_rdatatype_hip = 55,
+	dns_rdatatype_ninfo = 56,
+	dns_rdatatype_rkey = 57,
+	dns_rdatatype_talink = 58,
+	dns_rdatatype_cds = 59,
+	dns_rdatatype_cdnskey = 60,
+	dns_rdatatype_openpgpkey = 61,
+	dns_rdatatype_csync = 62,
 	dns_rdatatype_spf = 99,
 	dns_rdatatype_unspec = 103,
+	dns_rdatatype_nid = 104,
+	dns_rdatatype_l32 = 105,
+	dns_rdatatype_l64 = 106,
+	dns_rdatatype_lp = 107,
+	dns_rdatatype_eui48 = 108,
+	dns_rdatatype_eui64 = 109,
 	dns_rdatatype_tkey = 249,
 	dns_rdatatype_tsig = 250,
+	dns_rdatatype_uri = 256,
+	dns_rdatatype_caa = 257,
+	dns_rdatatype_avc = 258,
+	dns_rdatatype_ta = 32768,
 	dns_rdatatype_dlv = 32769,
 	dns_rdatatype_keydata = 65533,
 	dns_rdatatype_ixfr = 251,
@@ -130,6 +149,7 @@
 #define dns_rdatatype_cert	((dns_rdatatype_t)dns_rdatatype_cert)
 #define dns_rdatatype_a6	((dns_rdatatype_t)dns_rdatatype_a6)
 #define dns_rdatatype_dname	((dns_rdatatype_t)dns_rdatatype_dname)
+#define dns_rdatatype_sink	((dns_rdatatype_t)dns_rdatatype_sink)
 #define dns_rdatatype_opt	((dns_rdatatype_t)dns_rdatatype_opt)
 #define dns_rdatatype_apl	((dns_rdatatype_t)dns_rdatatype_apl)
 #define dns_rdatatype_ds	((dns_rdatatype_t)dns_rdatatype_ds)
@@ -142,11 +162,29 @@
 #define dns_rdatatype_nsec3	((dns_rdatatype_t)dns_rdatatype_nsec3)
 #define dns_rdatatype_nsec3param	((dns_rdatatype_t)dns_rdatatype_nsec3param)
 #define dns_rdatatype_tlsa	((dns_rdatatype_t)dns_rdatatype_tlsa)
+#define dns_rdatatype_smimea	((dns_rdatatype_t)dns_rdatatype_smimea)
 #define dns_rdatatype_hip	((dns_rdatatype_t)dns_rdatatype_hip)
+#define dns_rdatatype_ninfo	((dns_rdatatype_t)dns_rdatatype_ninfo)
+#define dns_rdatatype_rkey	((dns_rdatatype_t)dns_rdatatype_rkey)
+#define dns_rdatatype_talink	((dns_rdatatype_t)dns_rdatatype_talink)
+#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_csync	((dns_rdatatype_t)dns_rdatatype_csync)
 #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)
+#define dns_rdatatype_l32	((dns_rdatatype_t)dns_rdatatype_l32)
+#define dns_rdatatype_l64	((dns_rdatatype_t)dns_rdatatype_l64)
+#define dns_rdatatype_lp	((dns_rdatatype_t)dns_rdatatype_lp)
+#define dns_rdatatype_eui48	((dns_rdatatype_t)dns_rdatatype_eui48)
+#define dns_rdatatype_eui64	((dns_rdatatype_t)dns_rdatatype_eui64)
 #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_caa	((dns_rdatatype_t)dns_rdatatype_caa)
+#define dns_rdatatype_avc	((dns_rdatatype_t)dns_rdatatype_avc)
+#define dns_rdatatype_ta	((dns_rdatatype_t)dns_rdatatype_ta)
 #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)

Modified: trunk/lib/bind/dns/dns/rdatastruct.h
===================================================================
--- trunk/lib/bind/dns/dns/rdatastruct.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/dns/dns/rdatastruct.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,7 +1,6 @@
 /* $MidnightBSD$ */
-
 /*
- * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -43,7 +42,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: rdatastructpre.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_RDATASTRUCT_H
 #define DNS_RDATASTRUCT_H 1
@@ -89,7 +88,7 @@
 #ifndef IN_1_A_1_H
 #define IN_1_A_1_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: a_1.h,v 1.28 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_in_a {
 	dns_rdatacommon_t	common;
@@ -113,7 +112,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: a_1.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
 
 /* by Bjorn.Victor at it.uu.se, 2005-05-07 */
 /* Based on generic/mx_15.h */
@@ -152,7 +151,7 @@
 #ifndef HS_4_A_1_H
 #define HS_4_A_1_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: a_1.h,v 1.12 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_hs_a {
 	dns_rdatacommon_t	common;
@@ -181,7 +180,7 @@
 #ifndef GENERIC_NS_2_H
 #define GENERIC_NS_2_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: ns_2.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_ns {
 	dns_rdatacommon_t	common;
@@ -212,7 +211,7 @@
 #ifndef GENERIC_MD_3_H
 #define GENERIC_MD_3_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: md_3.h,v 1.28 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_md {
 	dns_rdatacommon_t	common;
@@ -243,7 +242,7 @@
 #ifndef GENERIC_MF_4_H
 #define GENERIC_MF_4_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: mf_4.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mf {
 	dns_rdatacommon_t	common;
@@ -269,7 +268,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: cname_5.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_CNAME_5_H
 #define GENERIC_CNAME_5_H 1
@@ -302,7 +301,7 @@
 #ifndef GENERIC_SOA_6_H
 #define GENERIC_SOA_6_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: soa_6.h,v 1.32 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_soa {
 	dns_rdatacommon_t	common;
@@ -339,7 +338,7 @@
 #ifndef GENERIC_MB_7_H
 #define GENERIC_MB_7_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: mb_7.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mb {
 	dns_rdatacommon_t	common;
@@ -369,7 +368,7 @@
 #ifndef GENERIC_MG_8_H
 #define GENERIC_MG_8_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: mg_8.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mg {
 	dns_rdatacommon_t	common;
@@ -399,7 +398,7 @@
 #ifndef GENERIC_MR_9_H
 #define GENERIC_MR_9_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: mr_9.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mr {
 	dns_rdatacommon_t	common;
@@ -429,7 +428,7 @@
 #ifndef GENERIC_NULL_10_H
 #define GENERIC_NULL_10_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: null_10.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_null {
 	dns_rdatacommon_t	common;
@@ -460,7 +459,7 @@
 #ifndef IN_1_WKS_11_H
 #define IN_1_WKS_11_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: wks_11.h,v 1.22 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef	struct dns_rdata_in_wks {
 	dns_rdatacommon_t	common;
@@ -493,7 +492,7 @@
 #ifndef GENERIC_PTR_12_H
 #define GENERIC_PTR_12_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: ptr_12.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_ptr {
         dns_rdatacommon_t       common;
@@ -522,7 +521,7 @@
 #ifndef GENERIC_HINFO_13_H
 #define GENERIC_HINFO_13_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: hinfo_13.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_hinfo {
 	dns_rdatacommon_t	common;
@@ -555,7 +554,7 @@
 #ifndef GENERIC_MINFO_14_H
 #define GENERIC_MINFO_14_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: minfo_14.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_minfo {
 	dns_rdatacommon_t	common;
@@ -586,7 +585,7 @@
 #ifndef GENERIC_MX_15_H
 #define GENERIC_MX_15_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: mx_15.h,v 1.29 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mx {
 	dns_rdatacommon_t	common;
@@ -617,7 +616,7 @@
 #ifndef GENERIC_TXT_16_H
 #define GENERIC_TXT_16_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: txt_16.h,v 1.28 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_txt_string {
                 isc_uint8_t    length;
@@ -668,7 +667,7 @@
 #ifndef GENERIC_RP_17_H
 #define GENERIC_RP_17_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: rp_17.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
@@ -702,7 +701,7 @@
 #ifndef GENERIC_AFSDB_18_H
 #define GENERIC_AFSDB_18_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: afsdb_18.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
@@ -736,7 +735,7 @@
 #ifndef GENERIC_X25_19_H
 #define GENERIC_X25_19_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: x25_19.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
@@ -769,7 +768,7 @@
 #ifndef GENERIC_ISDN_20_H
 #define GENERIC_ISDN_20_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: isdn_20.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \brief Per RFC1183 */
@@ -804,7 +803,7 @@
 #ifndef GENERIC_RT_21_H
 #define GENERIC_RT_21_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: rt_21.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
@@ -837,7 +836,7 @@
 #ifndef IN_1_NSAP_22_H
 #define IN_1_NSAP_22_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: nsap_22.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC1706 */
@@ -870,7 +869,7 @@
 #ifndef IN_1_NSAP_PTR_23_H
 #define IN_1_NSAP_PTR_23_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: nsap-ptr_23.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC1348.  Obsoleted in RFC 1706 - use PTR instead. */
@@ -902,7 +901,7 @@
 #ifndef GENERIC_SIG_24_H
 #define GENERIC_SIG_24_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: sig_24.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2535 */
@@ -925,7 +924,7 @@
 
 #endif /* GENERIC_SIG_24_H */
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -944,19 +943,19 @@
 #ifndef GENERIC_KEY_25_H
 #define GENERIC_KEY_25_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: key_25.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \brief Per RFC2535 */
 
-typedef struct dns_rdata_key_t {
-        dns_rdatacommon_t	common;
-        isc_mem_t *		mctx;
-        isc_uint16_t		flags;
-        isc_uint8_t		protocol;
-        isc_uint8_t		algorithm;
-        isc_uint16_t		datalen;
-        unsigned char *		data;
+typedef struct dns_rdata_key {
+	dns_rdatacommon_t	common;
+	isc_mem_t *		mctx;
+	isc_uint16_t		flags;
+	isc_uint8_t		protocol;
+	isc_uint8_t		algorithm;
+	isc_uint16_t		datalen;
+	unsigned char *		data;
 } dns_rdata_key_t;
 
 
@@ -981,7 +980,7 @@
 #ifndef IN_1_PX_26_H
 #define IN_1_PX_26_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: px_26.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2163 */
@@ -1015,7 +1014,7 @@
 #ifndef GENERIC_GPOS_27_H
 #define GENERIC_GPOS_27_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: gpos_27.h,v 1.17 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief per RFC1712 */
@@ -1052,7 +1051,7 @@
 #ifndef IN_1_AAAA_28_H
 #define IN_1_AAAA_28_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: aaaa_28.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC1886 */
@@ -1083,7 +1082,7 @@
 #ifndef GENERIC_LOC_29_H
 #define GENERIC_LOC_29_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: loc_29.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \brief Per RFC1876 */
@@ -1126,7 +1125,7 @@
 #ifndef GENERIC_NXT_30_H
 #define GENERIC_NXT_30_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: nxt_30.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief RFC2535 */
@@ -1160,7 +1159,7 @@
 #ifndef IN_1_SRV_33_H
 #define IN_1_SRV_33_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: srv_33.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
@@ -1178,7 +1177,7 @@
 
 #endif /* IN_1_SRV_33_H */
 /*
- * Copyright (C) 2004, 2005, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -1194,15 +1193,15 @@
  * 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: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id$ */
 
 /*!
  *  \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;
@@ -1214,9 +1213,9 @@
 	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.
@@ -1237,7 +1236,7 @@
 #ifndef IN_1_KX_36_H
 #define IN_1_KX_36_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: kx_36.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2230 */
@@ -1267,7 +1266,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: cert_37.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_CERT_37_H
 #define GENERIC_CERT_37_H 1
@@ -1304,7 +1303,7 @@
 #ifndef IN_1_A6_38_H
 #define IN_1_A6_38_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: a6_38.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2874 */
@@ -1338,7 +1337,7 @@
 #ifndef GENERIC_DNAME_39_H
 #define GENERIC_DNAME_39_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: dname_39.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! 
  *  \brief per RFC2672 */
@@ -1351,6 +1350,36 @@
 
 #endif /* GENERIC_DNAME_39_H */
 /*
+ * Copyright (C) 2015  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_SINK_40_H
+#define GENERIC_SINK_40_H 1
+
+typedef struct dns_rdata_sink_t {
+	dns_rdatacommon_t	common;
+	isc_mem_t *		mctx;
+	isc_uint8_t		meaning;
+	isc_uint8_t		coding;
+	isc_uint8_t		subcoding;
+	isc_uint16_t		datalen;
+	unsigned char *		data;
+} dns_rdata_sink_t;
+
+#endif /* GENERIC_SINK_40_H */
+/*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
@@ -1370,7 +1399,7 @@
 #ifndef GENERIC_OPT_41_H
 #define GENERIC_OPT_41_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: opt_41.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2671 */
@@ -1426,7 +1455,7 @@
 #ifndef IN_1_APL_42_H
 #define IN_1_APL_42_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: apl_42.h,v 1.6 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_apl_ent {
 	isc_boolean_t	negative;
@@ -1478,7 +1507,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: ds_43.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_DS_43_H
 #define GENERIC_DS_43_H 1
@@ -1513,7 +1542,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: sshfp_44.h,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC 4255 */
@@ -1547,7 +1576,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: ipseckey_45.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_IPSECKEY_45_H
 #define GENERIC_IPSECKEY_45_H 1
@@ -1586,7 +1615,7 @@
 #ifndef GENERIC_DNSSIG_46_H
 #define GENERIC_DNSSIG_46_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: rrsig_46.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2535 */
@@ -1627,7 +1656,7 @@
 #ifndef GENERIC_NSEC_47_H
 #define GENERIC_NSEC_47_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: nsec_47.h,v 1.10 2008/07/15 23:47:21 tbox Exp $ */
 
 /*!
  * \brief Per RFC 3845 */
@@ -1642,7 +1671,7 @@
 
 #endif /* GENERIC_NSEC_47_H */
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -1661,22 +1690,12 @@
 #ifndef GENERIC_DNSKEY_48_H
 #define GENERIC_DNSKEY_48_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
-
 /*!
- *  \brief per RFC2535 */
+ *  \brief per RFC2535
+ */
 
-typedef struct dns_rdata_dnskey {
-        dns_rdatacommon_t	common;
-        isc_mem_t *		mctx;
-        isc_uint16_t		flags;
-        isc_uint8_t		protocol;
-        isc_uint8_t		algorithm;
-        isc_uint16_t		datalen;
-        unsigned char *		data;
-} dns_rdata_dnskey_t;
+typedef struct dns_rdata_key dns_rdata_dnskey_t;
 
-
 #endif /* GENERIC_DNSKEY_48_H */
 /*
  * Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -1698,7 +1717,7 @@
 #ifndef IN_1_DHCID_49_H
 #define IN_1_DHCID_49_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: dhcid_49.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_in_dhcid {
 	dns_rdatacommon_t	common;
@@ -1709,7 +1728,7 @@
 
 #endif /* IN_1_DHCID_49_H */
 /*
- * Copyright (C) 2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2011, 2012  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
@@ -1728,7 +1747,7 @@
 #ifndef GENERIC_NSEC3_50_H
 #define GENERIC_NSEC3_50_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id$ */
 
 /*!
  * \brief Per RFC 5155 */
@@ -1756,7 +1775,16 @@
 #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
@@ -1765,13 +1793,14 @@
  * 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.
@@ -1779,24 +1808,39 @@
  * 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.
  *
- * Used to identify NSEC3PARAM records added in this UPDATE request.
+ * 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.
+ *
+ * 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
 
@@ -1821,7 +1865,7 @@
 #ifndef GENERIC_NSEC3PARAM_51_H
 #define GENERIC_NSEC3PARAM_51_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: nsec3param_51.h,v 1.4 2008/09/25 04:02:39 tbox Exp $ */
 
 /*!
  * \brief Per RFC 5155 */
@@ -1840,7 +1884,7 @@
 
 #endif /* GENERIC_NSEC3PARAM_51_H */
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 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
@@ -1855,13 +1899,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id$ */
 
 #ifndef GENERIC_TLSA_52_H
 #define GENERIC_TLSA_52_H 1
 
 /*!
- *  \brief per draft-ietf-dane-protocol-19.txt
+ *  \brief per rfc6698.txt
  */
 typedef struct dns_rdata_tlsa {
 	dns_rdatacommon_t	common;
@@ -1875,6 +1919,28 @@
 
 #endif /* GENERIC_TLSA_52_H */
 /*
+ * Copyright (C) 2015  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_SMIMEA_53_H
+#define GENERIC_SMIMEA_53_H 1
+
+typedef struct dns_rdata_tlsa dns_rdata_smimea_t;
+
+#endif /* GENERIC_SMIMEA_53_H */
+/*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -1890,7 +1956,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: hip_55.h,v 1.2 2009/02/26 06:09:19 marka Exp $ */
 
 #ifndef GENERIC_HIP_5_H
 #define GENERIC_HIP_5_H 1
@@ -1922,7 +1988,203 @@
 
 #endif /* GENERIC_HIP_5_H */
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015  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_NINFO_56_H
+#define GENERIC_NINFO_56_H 1
+
+typedef struct dns_rdata_txt_string dns_rdata_ninfo_string_t;
+
+typedef struct dns_rdata_txt dns_rdata_ninfo_t;
+
+/*
+ * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done
+ * via rdatastructpre.h and rdatastructsuf.h.
+ */
+
+isc_result_t
+dns_rdata_ninfo_first(dns_rdata_ninfo_t *);
+
+isc_result_t
+dns_rdata_ninfo_next(dns_rdata_ninfo_t *);
+
+isc_result_t
+dns_rdata_ninfo_current(dns_rdata_ninfo_t *, dns_rdata_ninfo_string_t *);
+
+#endif /* GENERIC_NINFO_16_H */
+/*
+ * Copyright (C) 2015  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_RKEY_57_H
+#define GENERIC_RKEY_57_H 1
+
+typedef struct dns_rdata_key dns_rdata_rkey_t;
+
+#endif /* GENERIC_RKEY_57_H */
+/*
+ * Copyright (C) 2015  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.
+ */
+
+/* http://www.iana.org/assignments/dns-parameters/TALINK/talink-completed-template */
+
+#ifndef GENERIC_TALINK_58_H
+#define GENERIC_TALINK_58_H 1
+
+typedef struct dns_rdata_talink {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		prev;
+	dns_name_t		next;
+} dns_rdata_talink_t;
+
+#endif /* GENERIC_TALINK_58_H */
+/*
+ * Copyright (C) 2014, 2015  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_CDS_59_H
+#define GENERIC_CDS_59_H 1
+
+/* CDS records have the same RDATA fields as DS records. */
+typedef struct dns_rdata_ds dns_rdata_cds_t;
+
+#endif /* GENERIC_CDS_59_H */
+/*
+ * Copyright (C) 2014, 2015  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_CDNSKEY_60_H
+#define GENERIC_CDNSKEY_60_H 1
+
+/* CDNSKEY records have the same RDATA fields as DNSKEY records. */
+typedef struct dns_rdata_key dns_rdata_cdnskey_t;
+
+#endif /* GENERIC_CDNSKEY_60_H */
+/*
+ * 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) 2015  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_CSYNC_62_H
+#define GENERIC_CSYNC_62_H 1
+
+/*!
+ * \brief Per RFC 7477
+ */
+
+typedef struct dns_rdata_csync {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_uint32_t		serial;
+	isc_uint16_t		flags;
+	unsigned char		*typebits;
+	isc_uint16_t		len;
+} dns_rdata_csync_t;
+
+#endif /* GENERIC_CSYNC_62_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
@@ -1941,20 +2203,20 @@
 #ifndef GENERIC_SPF_99_H
 #define GENERIC_SPF_99_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $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;
 
 /*
@@ -1961,16 +2223,6 @@
  * 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")
@@ -1993,7 +2245,7 @@
 #ifndef GENERIC_UNSPEC_103_H
 #define GENERIC_UNSPEC_103_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: unspec_103.h,v 1.17 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_unspec_t {
 	dns_rdatacommon_t	common;
@@ -2004,6 +2256,167 @@
 
 #endif /* GENERIC_UNSPEC_103_H */
 /*
+ * Copyright (C) 2013  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_NID_104_H
+#define GENERIC_NID_104_H 1
+
+typedef struct dns_rdata_nid {
+	dns_rdatacommon_t	common;
+	isc_uint16_t		pref;
+	unsigned char		nid[8];
+} dns_rdata_nid_t;
+
+#endif /* GENERIC_NID_104_H */
+/*
+ * Copyright (C) 2013  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_L32_105_H
+#define GENERIC_L32_105_H 1
+
+typedef struct dns_rdata_l32 {
+	dns_rdatacommon_t	common;
+	isc_uint16_t		pref;
+	struct in_addr		l32;
+} dns_rdata_l32_t;
+
+#endif /* GENERIC_L32_105_H */
+/*
+ * Copyright (C) 2013  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_L64_106_H
+#define GENERIC_L64_106_H 1
+
+typedef struct dns_rdata_l64 {
+	dns_rdatacommon_t	common;
+	isc_uint16_t		pref;
+	unsigned char		l64[8];
+} dns_rdata_l64_t;
+
+#endif /* GENERIC_L64_106_H */
+/*
+ * Copyright (C) 2013  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_LP_107_H
+#define GENERIC_LP_107_H 1
+
+typedef struct dns_rdata_lp {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_uint16_t		pref;
+	dns_name_t		lp;
+} dns_rdata_lp_t;
+
+#endif /* GENERIC_LP_107_H */
+/*
+ * Copyright (C) 2013  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_EUI48_108_H
+#define GENERIC_EUI48_108_H 1
+
+typedef struct dns_rdata_eui48 {
+	dns_rdatacommon_t	common;
+	unsigned char		eui48[6];
+} dns_rdata_eui48_t;
+
+#endif /* GENERIC_EUI48_10k_H */
+/*
+ * Copyright (C) 2013  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_EUI64_109_H
+#define GENERIC_EUI64_109_H 1
+
+typedef struct dns_rdata_eui64 {
+	dns_rdatacommon_t	common;
+	unsigned char		eui64[8];
+} dns_rdata_eui64_t;
+
+#endif /* GENERIC_EUI64_10k_H */
+/*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
@@ -2023,7 +2436,7 @@
 #ifndef GENERIC_TKEY_249_H
 #define GENERIC_TKEY_249_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: tkey_249.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per draft-ietf-dnsind-tkey-00.txt */
@@ -2061,7 +2474,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: tsig_250.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef ANY_255_TSIG_250_H
 #define ANY_255_TSIG_250_H 1
@@ -2083,7 +2496,7 @@
 
 #endif /* ANY_255_TSIG_250_H */
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012  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
@@ -2098,21 +2511,136 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+#ifndef GENERIC_URI_256_H
+#define GENERIC_URI_256_H 1
 
+/* $Id$ */
+
+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) 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_CAA_257_H
+#define GENERIC_CAA_257_H 1
+
+/* $Id$ */
+
+typedef struct dns_rdata_caa {
+	dns_rdatacommon_t	common;
+	isc_mem_t *		mctx;
+	isc_uint8_t		flags;
+	unsigned char *		tag;
+	isc_uint8_t		tag_len;
+	unsigned char		*value;
+	isc_uint8_t		value_len;
+} dns_rdata_caa_t;
+
+#endif /* GENERIC_CAA_257_H */
+/*
+ * Copyright (C) 2016  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_AVC_258_H
+#define GENERIC_AVC_258_H 1
+
+typedef dns_rdata_txt_string_t dns_rdata_avc_string_t;
+
+typedef struct dns_rdata_avc {
+	dns_rdatacommon_t       common;
+	isc_mem_t               *mctx;
+	unsigned char           *data;
+	isc_uint16_t            length;
+	/* private */
+	isc_uint16_t            offset;
+} dns_rdata_avc_t;
+
+/*
+ * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done
+ * via rdatastructpre.h and rdatastructsuf.h.
+ */
+#endif /* GENERIC_AVC_258_H */
+/*
+ * Copyright (C) 2015  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_TA_32768_H
+#define GENERIC_TA_32768_H 1
+
+/*
+ * TA records are identical to DS records.
+ */
+typedef struct dns_rdata_ds dns_rdata_ta_t;
+
+#endif /* GENERIC_TA_32768_H */
+/*
+ * Copyright (C) 2004, 2006, 2007, 2015  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.
+ */
+
+/* $Id: dlv_32769.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
+
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 #ifndef GENERIC_DLV_32769_H
 #define GENERIC_DLV_32769_H 1
 
-typedef struct dns_rdata_dlv {
-	dns_rdatacommon_t	common;
-	isc_mem_t		*mctx;
-	isc_uint16_t		key_tag;
-	isc_uint8_t		algorithm;
-	isc_uint8_t		digest_type;
-	isc_uint16_t		length;
-	unsigned char		*digest;
-} dns_rdata_dlv_t;
+typedef struct dns_rdata_ds dns_rdata_dlv_t;
 
 #endif /* GENERIC_DLV_32769_H */
 /*
@@ -2134,7 +2662,7 @@
 #ifndef GENERIC_KEYDATA_65533_H
 #define GENERIC_KEYDATA_65533_H 1
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: keydata_65533.h,v 1.2 2009/06/30 02:52:32 each Exp $ */
 
 typedef struct dns_rdata_keydata {
 	dns_rdatacommon_t	common;
@@ -2167,7 +2695,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastruct.h,v 1.11 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: rdatastructsuf.h,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
 
 ISC_LANG_ENDDECLS
 

Modified: trunk/lib/bind/isc/Makefile
===================================================================
--- trunk/lib/bind/isc/Makefile	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/isc/Makefile	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,8 +1,8 @@
-# $MidnightBSD: src/lib/bind/isc/Makefile,v 1.7 2013/01/30 01:55:40 laffer1 Exp $
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 
-BIND_DIR=	${.CURDIR}/../../../contrib/bind98
+BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/isc
@@ -15,7 +15,7 @@
 SRCS+=		app.c dir.c entropy.c \
 		errno2result.c file.c fsaccess.c \
 		interfaceiter.c keyboard.c net.c \
-		os.c regex.c resource.c socket.c stdio.c \
+		os.c resource.c socket.c stdio.c \
 		stdtime.c strerror.c syslog.c time.c \
 
 .PATH:		${SRCDIR}/nls
@@ -28,7 +28,7 @@
 .PATH:		${SRCDIR}
 SRCS+=		inet_pton.c \
 		assertions.c backtrace.c base32.c base64.c bitstring.c \
-		buffer.c bufferlist.c commandline.c error.c event.c \
+		buffer.c bufferlist.c commandline.c counter.c error.c event.c \
 		fsaccess.c hash.c \
 		heap.c hex.c hmacmd5.c hmacsha.c \
 		httpd.c inet_aton.c \
@@ -37,12 +37,13 @@
 		lex.c lfsr.c lib.c log.c \
 		md5.c mem.c mutexblock.c \
 		netaddr.c netscope.c ondestroy.c \
-		parseint.c portset.c \
+		parseint.c pool.c portset.c \
 		print.c \
 		quota.c radix.c random.c \
-		ratelimiter.c refcount.c region.c result.c rwlock.c \
+		ratelimiter.c refcount.c region.c regex.c result.c rwlock.c \
+		safe.c \
 		serial.c sha1.c sha2.c sockaddr.c stats.c string.c strtoul.c \
-		symtab.c task.c taskpool.c timer.c version.c
+		symtab.c task.c taskpool.c tm.c timer.c version.c
 
 .PATH:		${.CURDIR}
 SRCS+=		backtrace-emptytbl.c
@@ -65,6 +66,7 @@
 		${SRCDIR}/include/isc/buffer.h \
 		${SRCDIR}/include/isc/bufferlist.h \
 		${SRCDIR}/include/isc/commandline.h \
+		${SRCDIR}/include/isc/counter.h \
 		${SRCDIR}/include/isc/entropy.h \
 		${SRCDIR}/include/isc/error.h \
 		${SRCDIR}/include/isc/event.h \
@@ -99,8 +101,10 @@
 		${SRCDIR}/include/isc/ondestroy.h \
 		${SRCDIR}/include/isc/os.h \
 		${SRCDIR}/include/isc/parseint.h \
+		${SRCDIR}/include/isc/pool.h \
 		${SRCDIR}/include/isc/portset.h \
 		${SRCDIR}/include/isc/print.h \
+		${SRCDIR}/include/isc/queue.h \
 		${SRCDIR}/include/isc/quota.h \
 		${SRCDIR}/include/isc/radix.h \
 		${SRCDIR}/include/isc/random.h \
@@ -107,10 +111,12 @@
 		${SRCDIR}/include/isc/ratelimiter.h \
 		${SRCDIR}/include/isc/refcount.h \
 		${SRCDIR}/include/isc/region.h \
+		${SRCDIR}/include/isc/regex.h \
 		${SRCDIR}/include/isc/resource.h \
 		${SRCDIR}/include/isc/result.h \
 		${SRCDIR}/include/isc/resultclass.h \
 		${SRCDIR}/include/isc/rwlock.h \
+		${SRCDIR}/include/isc/safe.h \
 		${SRCDIR}/include/isc/serial.h \
 		${SRCDIR}/include/isc/sha1.h \
 		${SRCDIR}/include/isc/sha2.h \
@@ -124,6 +130,7 @@
 		${SRCDIR}/include/isc/task.h \
 		${SRCDIR}/include/isc/taskpool.h \
 		${SRCDIR}/include/isc/timer.h \
+		${SRCDIR}/include/isc/tm.h \
 		${SRCDIR}/include/isc/types.h \
 		${SRCDIR}/include/isc/util.h \
 		${SRCDIR}/include/isc/version.h \

Modified: trunk/lib/bind/isc/backtrace-emptytbl.c
===================================================================
--- trunk/lib/bind/isc/backtrace-emptytbl.c	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/isc/backtrace-emptytbl.c	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,5 +1,4 @@
 /* $MidnightBSD$ */
-
 /*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
  *
@@ -16,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: backtrace-emptytbl.c,v 1.1 2013-01-30 01:55:40 laffer1 Exp $ */
+/* $Id: backtrace-emptytbl.c,v 1.3 2009-09-01 20:13:44 each Exp $ */
 
 /*! \file */
 

Modified: trunk/lib/bind/isc/isc/platform.h
===================================================================
--- trunk/lib/bind/isc/isc/platform.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/isc/isc/platform.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,7 +1,6 @@
 /* $MidnightBSD$ */
-
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,8 +16,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.7 2013-01-30 01:55:40 laffer1 Exp $ */
-
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
 
@@ -134,6 +131,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
@@ -169,6 +171,16 @@
 #undef ISC_PLATFORM_NEEDSPRINTF
 
 /*! \brief
+ * If this system need a modern printf() that format size %z (size_t).
+ */
+#undef ISC_PLATFORM_NEEDPRINTF
+
+/*! \brief
+ * If this system need a modern fprintf() that format size %z (size_t).
+ */
+#undef ISC_PLATFORM_NEEDFPRINTF
+
+/*! \brief
  * The printf format string modifier to use with isc_uint64_t values.
  */
 #define ISC_PLATFORM_QUADFORMAT "ll"
@@ -201,6 +213,11 @@
  */
 #undef ISC_PLATFORM_NEEDMEMMOVE
 
+/*
+ * Define if this system needs strcasestr.
+ */
+#undef ISC_PLATFORM_NEEDSTRCASESTR
+
 /***
  *** Miscellaneous.
  ***/
@@ -219,20 +236,20 @@
  * Defined to <gssapi.h> or <gssapi/gssapi.h> for how to include
  * 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.h>
 
-
 /*
  * Type used for resource limits.
  */
@@ -331,8 +348,8 @@
 /*
  * Define if the standard __asm function must be used.
  */
+#undef ISC_PLATFORM_USESTDASM
 
-
 /*
  * Define if the platform has <strings.h>.
  */
@@ -357,8 +374,8 @@
  * Define if MacOS style of PPC assembly must be used.
  * e.g. "r6", not "6", for register six.
  */
+#undef ISC_PLATFORM_USEMACASM
 
-
 #ifndef ISC_PLATFORM_USEDECLSPEC
 #define LIBISC_EXTERNAL_DATA
 #define LIBDNS_EXTERNAL_DATA
@@ -365,6 +382,7 @@
 #define LIBISCCC_EXTERNAL_DATA
 #define LIBISCCFG_EXTERNAL_DATA
 #define LIBBIND9_EXTERNAL_DATA
+#define LIBTESTS_EXTERNAL_DATA
 #else /*! \brief ISC_PLATFORM_USEDECLSPEC */
 #ifdef LIBISC_EXPORTS
 #define LIBISC_EXTERNAL_DATA __declspec(dllexport)
@@ -391,6 +409,11 @@
 #else
 #define LIBBIND9_EXTERNAL_DATA __declspec(dllimport)
 #endif
+#ifdef LIBTESTS_EXPORTS
+#define LIBTESTS_EXTERNAL_DATA __declspec(dllexport)
+#else
+#define LIBTESTS_EXTERNAL_DATA __declspec(dllimport)
+#endif
 #endif /*! \brief ISC_PLATFORM_USEDECLSPEC */
 
 /*

Modified: trunk/lib/bind/isccc/Makefile
===================================================================
--- trunk/lib/bind/isccc/Makefile	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/isccc/Makefile	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,9 +1,8 @@
-# $MidnightBSD: src/lib/bind/isccc/Makefile,v 1.4 2010/01/16 16:51:32 laffer1 Exp $
-# $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4.4.1 2005/11/16 07:59:50 ru Exp $
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 
-BIND_DIR=	${.CURDIR}/../../../contrib/bind98
+BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/isccc

Modified: trunk/lib/bind/isccfg/Makefile
===================================================================
--- trunk/lib/bind/isccfg/Makefile	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/isccfg/Makefile	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,9 +1,8 @@
-# $MidnightBSD: src/lib/bind/isccfg/Makefile,v 1.4 2010/01/16 17:40:19 laffer1 Exp $
-# $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.7 2007/06/02 23:19:56 dougb Exp $
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 
-BIND_DIR=	${.CURDIR}/../../../contrib/bind98
+BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/isccfg

Modified: trunk/lib/bind/lwres/Makefile
===================================================================
--- trunk/lib/bind/lwres/Makefile	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/lwres/Makefile	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,9 +1,8 @@
-# $MidnightBSD: src/lib/bind/lwres/Makefile,v 1.8 2010/01/16 16:51:32 laffer1 Exp $
-# $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7.2.1 2005/11/16 07:59:50 ru Exp $
+# $MidnightBSD$
 
 .include <bsd.own.mk>
 
-BIND_DIR=	${.CURDIR}/../../../contrib/bind98
+BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/lwres
@@ -18,12 +17,11 @@
 LIB=		lwres
 
 .PATH:		${SRCDIR} ${SRCDIR}/man
-SRCS+=		context.c gai_strerror.c getaddrinfo.c gethost.c \
+SRCS+=		compat.c context.c gai_strerror.c getaddrinfo.c gethost.c \
 		getipnode.c getnameinfo.c getrrset.c herror.c \
 		lwbuffer.c lwconfig.c lwpacket.c lwresutil.c \
 		lwres_gabn.c lwres_gnba.c lwres_grbn.c lwres_noop.c \
-		lwinetaton.c lwinetpton.c lwinetntop.c print.c \
-		strtoul.c
+		lwinetaton.c lwinetpton.c lwinetntop.c print.c
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 CFLAGS+=	-I${.CURDIR}
@@ -120,6 +118,7 @@
 		${SRCDIR}/include/lwres/lwpacket.h \
 		${SRCDIR}/include/lwres/lwres.h \
 		${SRCDIR}/include/lwres/result.h \
+		${SRCDIR}/include/lwres/string.h \
 		${SRCDIR}/include/lwres/version.h \
 		${SRCDIR}/unix/include/lwres/net.h \
 		lwres/netdb.h \

Modified: trunk/lib/bind/lwres/lwres/netdb.h
===================================================================
--- trunk/lib/bind/lwres/lwres/netdb.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/lwres/lwres/netdb.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.5 2011-02-08 22:00:47 laffer1 Exp $ */
+/* $Id: netdb.h.in,v 1.41 2009/01/18 23:48:14 tbox Exp $ */
 
 /*! \file */
 
@@ -88,6 +89,7 @@
 #undef	EAI_SYSTEM
 #undef	EAI_BADHINTS
 #undef	EAI_PROTOCOL
+#undef	EAI_OVERFLOW
 #undef	EAI_MAX
 
 #define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
@@ -103,7 +105,8 @@
 #define	EAI_SYSTEM	11	/* system error returned in errno */
 #define EAI_BADHINTS	12
 #define EAI_PROTOCOL	13
-#define EAI_MAX		14
+#define EAI_OVERFLOW	14
+#define EAI_MAX		15
 
 /*
  * Flag values for getaddrinfo()

Modified: trunk/lib/bind/lwres/lwres/platform.h
===================================================================
--- trunk/lib/bind/lwres/lwres/platform.h	2016-11-05 15:17:15 UTC (rev 9211)
+++ trunk/lib/bind/lwres/lwres/platform.h	2016-11-05 16:43:52 UTC (rev 9212)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.5 2011-02-08 22:00:47 laffer1 Exp $ */
+/* $Id: platform.h.in,v 1.21 2007/06/19 23:47:23 tbox Exp $ */
 
 /*! \file */
 
@@ -59,7 +60,7 @@
 #undef LWRES_PLATFORM_NEEDIN6ADDRANY
 
 /*
- * If this system is missing in6addr_loopback, 
+ * If this system is missing in6addr_loopback,
  * LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK will be defined.
  */
 #undef LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK
@@ -84,12 +85,12 @@
  * Defined this system needs vsnprintf() and snprintf().
  */
 #undef LWRES_PLATFORM_NEEDVSNPRINTF
- 
+
 /*
  * If this system need a modern sprintf() that returns (int) not (char*).
  */
-#undef LWRES_PLATFORM_NEEDSPRINTF
 
+
 /*
  * The printf format string modifier to use with lwres_uint64_t values.
  */
@@ -100,6 +101,11 @@
  */
 #undef LWRES_PLATFORM_NEEDSTRTOUL
 
+/*! \brief
+ * Define if this system needs strlcpy.
+ */
+#undef LWRES_PLATFORM_NEEDSTRLCPY
+
 #ifndef LWRES_PLATFORM_USEDECLSPEC
 #define LIBLWRES_EXTERNAL_DATA
 #else



More information about the Midnightbsd-cvs mailing list