diff options
Diffstat (limited to 'lib/bind')
| -rw-r--r-- | lib/bind/Makefile | 2 | ||||
| -rw-r--r-- | lib/bind/bind/Makefile | 87 | ||||
| -rw-r--r-- | lib/bind/bind/config.h | 71 | ||||
| -rw-r--r-- | lib/bind/bind/port_after.h | 509 | ||||
| -rw-r--r-- | lib/bind/bind/port_before.h | 175 | ||||
| -rw-r--r-- | lib/bind/config.h | 38 | ||||
| -rw-r--r-- | lib/bind/dns/Makefile | 5 | ||||
| -rw-r--r-- | lib/bind/dns/code.h | 100 | ||||
| -rw-r--r-- | lib/bind/dns/dns/enumclass.h | 2 | ||||
| -rw-r--r-- | lib/bind/dns/dns/enumtype.h | 8 | ||||
| -rw-r--r-- | lib/bind/dns/dns/rdatastruct.h | 479 | ||||
| -rw-r--r-- | lib/bind/isc/Makefile | 22 | ||||
| -rw-r--r-- | lib/bind/isc/isc/platform.h | 130 | ||||
| -rw-r--r-- | lib/bind/lwres/Makefile | 3 | ||||
| -rw-r--r-- | lib/bind/lwres/lwres/netdb.h | 8 | ||||
| -rw-r--r-- | lib/bind/lwres/lwres/platform.h | 6 |
16 files changed, 555 insertions, 1090 deletions
diff --git a/lib/bind/Makefile b/lib/bind/Makefile index 5eccf49..4268219 100644 --- a/lib/bind/Makefile +++ b/lib/bind/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= bind bind9 dns isc isccc isccfg lwres +SUBDIR= bind9 dns isc isccc isccfg lwres .include <bsd.subdir.mk> diff --git a/lib/bind/bind/Makefile b/lib/bind/bind/Makefile deleted file mode 100644 index 7f3bd82..0000000 --- a/lib/bind/bind/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# $FreeBSD$ - -#.include <bsd.own.mk> - -BIND_DIR= ${.CURDIR}/../../../contrib/bind9 -LIB_BIND_REL= .. -LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} -SRCDIR= ${BIND_DIR}/lib/bind - -# XXX These should come before -I's from config.mk. -CFLAGS+= -I${SRCDIR}/port/freebsd/include -I${SRCDIR}/include -CFLAGS+= -I${.CURDIR} - -.include "${LIB_BIND_DIR}/config.mk" - -LIB= bind - -.PATH: ${SRCDIR}/bsd -SRCS+= ftruncate.c gettimeofday.c \ - mktemp.c putenv.c readv.c setenv.c \ - setitimer.c strcasecmp.c strdup.c \ - strerror.c strpbrk.c strtoul.c utimes.c \ - writev.c - -.PATH: ${SRCDIR}/dst -SRCS+= dst_api.c hmac_link.c md5_dgst.c support.c - -.PATH: ${SRCDIR}/inet -SRCS+= inet_addr.c inet_cidr_ntop.c inet_cidr_pton.c \ - inet_data.c inet_lnaof.c inet_makeaddr.c \ - inet_net_ntop.c inet_net_pton.c inet_neta.c \ - inet_netof.c inet_network.c inet_ntoa.c \ - inet_ntop.c inet_pton.c nsap_addr.c - -.PATH: ${SRCDIR}/irs -SRCS+= gethostent_r.c getnetgrent_r.c \ - getprotoent_r.c getservent_r.c \ - dns.c dns_ho.c dns_nw.c dns_pr.c \ - dns_sv.c gai_strerror.c gen.c gen_ho.c \ - gen_ng.c gen_nw.c gen_pr.c gen_sv.c \ - getaddrinfo.c gethostent.c getnameinfo.c \ - getnetent.c getnetent_r.c getnetgrent.c \ - getprotoent.c getservent.c hesiod.c \ - irp.c irp_ho.c irp_ng.c irp_nw.c \ - irp_pr.c irp_sv.c irpmarshall.c irs_data.c \ - lcl.c lcl_ho.c lcl_ng.c lcl_nw.c \ - lcl_pr.c lcl_sv.c nis.c nul_ng.c util.c - -.PATH: ${SRCDIR}/isc -SRCS+= assertions.c base64.c bitncmp.c ctl_clnt.c \ - ctl_p.c ctl_srvr.c ev_connects.c ev_files.c \ - ev_streams.c ev_timers.c ev_waits.c \ - eventlib.c heap.c hex.c logging.c \ - memcluster.c movefile.c tree.c - -.PATH: ${SRCDIR}/nameser -SRCS+= ns_date.c ns_name.c ns_netint.c \ - ns_parse.c ns_print.c ns_samedomain.c \ - ns_sign.c ns_ttl.c ns_verify.c - -.PATH: ${SRCDIR}/resolv -SRCS+= herror.c mtctxres.c res_comp.c \ - res_data.c res_debug.c res_findzonecut.c \ - res_init.c res_mkquery.c res_mkupdate.c \ - res_query.c res_send.c res_sendsigned.c \ - res_update.c - -DPADD= ${PTHREAD_DPADD} -LDADD= ${PTHREAD_LDADD} - -#.if ${MK_BIND_LIBS} != "no" -#INCS= ${SRCDIR}/include/isc/assertions.h \ -# ${SRCDIR}/include/isc/ctl.h \ -# ${SRCDIR}/include/isc/dst.h \ -# ${SRCDIR}/include/isc/eventlib.h \ -# ${SRCDIR}/include/isc/heap.h \ -# ${SRCDIR}/include/isc/irpmarshall.h \ -# ${SRCDIR}/include/isc/list.h \ -# ${SRCDIR}/include/isc/logging.h \ -# ${SRCDIR}/include/isc/memcluster.h \ -# ${SRCDIR}/include/isc/misc.h \ -# ${SRCDIR}/include/isc/tree.h -# -#INCSDIR= ${INCLUDEDIR}/isc -#.endif - -.include <bsd.lib.mk> diff --git a/lib/bind/bind/config.h b/lib/bind/bind/config.h deleted file mode 100644 index e9d32d5..0000000 --- a/lib/bind/bind/config.h +++ /dev/null @@ -1,71 +0,0 @@ -/* $FreeBSD$ */ - -/* config.h. Generated from config.h.in by configure. */ -/* #undef _SOCKADDR_LEN */ -#define HAVE_FCNTL_H 1 -#define HAVE_PATHS_H 1 -#define HAVE_INTTYPES_H 1 -/* #undef HAVE_STROPTS_H */ -#define HAVE_SYS_TIMERS_H 1 -#define HAVE_SYS_SELECT_H 1 -#define HAVE_MEMORY_H 1 -/* #undef SYS_CDEFS_H */ -/* #undef _POSIX_PTHREAD_SEMANTICS */ -/* #undef POSIX_GETPWUID_R */ -/* #undef POSIX_GETPWNAM_R */ -/* #undef POSIX_GETGRGID_R */ -/* #undef POSIX_GETGRNAM_R */ -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCHR 1 -/* #undef SPRINTF_CHAR */ -/* #undef VSPRINTF_CHAR */ -#define USE_SYSERROR_LIST 1 -/* #undef NEED_STRTOUL */ -/* #undef NEED_SUN4PROTOS */ -/* #undef REENABLE_SEND */ - -/* #undef NEED_SETGROUPENT */ -/* #undef NEED_GETGROUPLIST */ - -/* define if prototype for getgrnam_r() is required */ -/* #undef NEED_GETGRNAM_R */ -/* #undef NEED_GETGRGID_R */ -/* #undef NEED_GETGRENT_R */ -#define NEED_SETGRENT_R 1 -#define NEED_ENDGRENT_R 1 - -#define NEED_INNETGR_R 1 -/* #undef NEED_SETNETGRENT_R */ -#define NEED_ENDNETGRENT_R 1 - -/* #undef NEED_GETPWNAM_R */ -/* #undef NEED_GETPWUID_R */ -#define NEED_SETPWENT_R 1 -#define NEED_SETPASSENT_R 1 -#define NEED_SETPWENT_R 1 -/* #undef NEED_GETPWENT_R */ -#define NEED_ENDPWENT_R 1 - -/* #undef NEED_SETPASSENT */ - -#define HAS_PW_CLASS 1 - -/* #undef ssize_t */ -/* #undef uintptr_t */ - -/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ -/* #undef SHUTUP_SPUTAUX */ -#ifdef SHUTUP_SPUTAUX -struct __sFILE; -extern __inline int __sputaux(int _c, struct __sFILE *_p); -#endif -/* #undef BROKEN_IN6ADDR_INIT_MACROS */ -#define HAVE_STRLCAT 1 -/* Shut up warnings about missing braces */ -/* #undef SHUTUP_MUTEX_INITIALIZER */ -#ifdef SHUTUP_MUTEX_INITIALIZER -#define LIBBIND_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } -#else -#define LIBBIND_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#endif - diff --git a/lib/bind/bind/port_after.h b/lib/bind/bind/port_after.h deleted file mode 100644 index 5251b08..0000000 --- a/lib/bind/bind/port_after.h +++ /dev/null @@ -1,509 +0,0 @@ -/* $FreeBSD$ */ - -#ifndef port_after_h -#define port_after_h - -#include <stdio.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/param.h> -#include <sys/time.h> -#if (!defined(BSD)) || (BSD < 199306) -#include <sys/bitypes.h> -#endif -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> -#endif -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif /* HAVE_SYS_SELECT_H */ - -#ifdef REENABLE_SEND -#undef send -#endif - -#undef NEED_PSELECT -#define HAVE_SA_LEN 1 -#define HAVE_MINIMUM_IFREQ 1 -#undef NEED_DAEMON -#undef NEED_STRSEP -#undef NEED_STRERROR -#ifdef NEED_STRERROR -const char *isc_strerror(int); -#define strerror isc_strerror -#endif -#define HAS_INET6_STRUCTS 1 -#define HAVE_SIN6_SCOPE_ID 1 -#undef NEED_IN6ADDR_ANY -#undef HAS_IN_ADDR6 -#define HAVE_SOCKADDR_STORAGE 1 -#undef NEED_GETTIMEOFDAY -#define HAVE_STRNDUP 1 -#undef USE_FIONBIO_IOCTL -#undef INNETGR_ARGS -#undef SETNETGRENT_ARGS -#define USE_IFNAMELINKID 1 -#define PORT_NONBLOCK O_NONBLOCK - -#ifndef _POSIX_PATH_MAX -#define _POSIX_PATH_MAX 255 -#endif -#ifndef PATH_MAX -#define PATH_MAX _POSIX_PATH_MAX -#endif - -/* - * We need to know the IPv6 address family number even on IPv4-only systems. - * Note that this is NOT a protocol constant, and that if the system has its - * own AF_INET6, different from ours below, all of BIND's libraries and - * executables will need to be recompiled after the system <sys/socket.h> - * has had this type added. The type number below is correct on most BSD- - * derived systems for which AF_INET6 is defined. - */ -#ifndef AF_INET6 -#define AF_INET6 24 -#endif - -#ifndef PF_INET6 -#define PF_INET6 AF_INET6 -#endif - -#ifdef HAS_IN_ADDR6 -/* Map to pre-RFC structure. */ -#define in6_addr in_addr6 -#endif - -#ifndef HAS_INET6_STRUCTS -/* Replace with structure from later rev of O/S if known. */ -struct in6_addr { - u_int8_t s6_addr[16]; -}; - -#define IN6ADDR_ANY_INIT \ - {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} - -#define IN6ADDR_LOOPBACK_INIT \ - {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }} - -/* Replace with structure from later rev of O/S if known. */ -struct sockaddr_in6 { -#ifdef HAVE_SA_LEN - u_int8_t sin6_len; /* length of this struct */ - u_int8_t sin6_family; /* AF_INET6 */ -#else - u_int16_t sin6_family; /* AF_INET6 */ -#endif - u_int16_t sin6_port; /* transport layer port # */ - u_int32_t sin6_flowinfo; /* IPv6 flow information */ - struct in6_addr sin6_addr; /* IPv6 address */ - u_int32_t sin6_scope_id; /* set of interfaces for a scope */ -}; -#endif /* HAS_INET6_STRUCTS */ - -#ifdef BROKEN_IN6ADDR_INIT_MACROS -#undef IN6ADDR_ANY_INIT -#undef IN6ADDR_LOOPBACK_INIT -#endif - -#ifdef _AIX -#ifndef IN6ADDR_ANY_INIT -#define IN6ADDR_ANY_INIT {{{ 0, 0, 0, 0 }}} -#endif -#ifndef IN6ADDR_LOOPBACK_INIT -#if BYTE_ORDER == BIG_ENDIAN -#define IN6ADDR_LOOPBACK_INIT {{{ 0, 0, 0, 1 }}} -#else -#define IN6ADDR_LOOPBACK_INIT {{{0, 0, 0, 0x01000000}}} -#endif -#endif -#endif - -#ifndef IN6ADDR_ANY_INIT -#ifdef s6_addr -#define IN6ADDR_ANY_INIT \ - {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}} -#else -#define IN6ADDR_ANY_INIT \ - {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} -#endif - -#endif -#ifndef IN6ADDR_LOOPBACK_INIT -#ifdef s6_addr -#define IN6ADDR_LOOPBACK_INIT \ - {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}} -#else -#define IN6ADDR_LOOPBACK_INIT \ - {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }} -#endif -#endif - -#ifndef HAVE_SOCKADDR_STORAGE -#define __SS_MAXSIZE 128 -#define __SS_ALLIGSIZE (sizeof (long)) - -struct sockaddr_storage { -#ifdef HAVE_SA_LEN - u_int8_t ss_len; /* address length */ - u_int8_t ss_family; /* address family */ - char __ss_pad1[__SS_ALLIGSIZE - 2 * sizeof(u_int8_t)]; - long __ss_align; - char __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE]; -#else - u_int16_t ss_family; /* address family */ - char __ss_pad1[__SS_ALLIGSIZE - sizeof(u_int16_t)]; - long __ss_align; - char __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE]; -#endif -}; -#endif - - -#if !defined(HAS_INET6_STRUCTS) || defined(NEED_IN6ADDR_ANY) -#define in6addr_any isc_in6addr_any -extern const struct in6_addr in6addr_any; -#endif - -/* - * IN6_ARE_ADDR_EQUAL, IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_V4COMPAT and - * IN6_IS_ADDR_V4MAPPED are broken in glibc 2.1. - */ -#ifdef __GLIBC__ -#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) -#undef IN6_ARE_ADDR_EQUAL -#undef IN6_IS_ADDR_UNSPECIFIED -#undef IN6_IS_ADDR_V4COMPAT -#undef IN6_IS_ADDR_V4MAPPED -#endif -#endif - -#ifndef IN6_ARE_ADDR_EQUAL -#define IN6_ARE_ADDR_EQUAL(a,b) \ - (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0) -#endif - -#ifndef IN6_IS_ADDR_UNSPECIFIED -#define IN6_IS_ADDR_UNSPECIFIED(a) \ - IN6_ARE_ADDR_EQUAL(a, &in6addr_any) -#endif - -#ifndef IN6_IS_ADDR_LOOPBACK -extern const struct in6_addr isc_in6addr_loopback; -#define IN6_IS_ADDR_LOOPBACK(a) \ - IN6_ARE_ADDR_EQUAL(a, &isc_in6addr_loopback) -#endif - -#ifndef IN6_IS_ADDR_V4MAPPED -#define IN6_IS_ADDR_V4MAPPED(a) \ - ((a)->s6_addr[0] == 0x00 && (a)->s6_addr[1] == 0x00 && \ - (a)->s6_addr[2] == 0x00 && (a)->s6_addr[3] == 0x00 && \ - (a)->s6_addr[4] == 0x00 && (a)->s6_addr[5] == 0x00 && \ - (a)->s6_addr[6] == 0x00 && (a)->s6_addr[9] == 0x00 && \ - (a)->s6_addr[8] == 0x00 && (a)->s6_addr[9] == 0x00 && \ - (a)->s6_addr[10] == 0xff && (a)->s6_addr[11] == 0xff) -#endif - -#ifndef IN6_IS_ADDR_SITELOCAL -#define IN6_IS_ADDR_SITELOCAL(a) \ - (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0)) -#endif - -#ifndef IN6_IS_ADDR_LINKLOCAL -#define IN6_IS_ADDR_LINKLOCAL(a) \ - (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80)) -#endif - -#ifndef IN6_IS_ADDR_MULTICAST -#define IN6_IS_ADDR_MULTICAST(a) ((a)->s6_addr[0] == 0xff) -#endif - -#ifndef __IPV6_ADDR_MC_SCOPE -#define __IPV6_ADDR_MC_SCOPE(a) ((a)->s6_addr[1] & 0x0f) -#endif - -#ifndef __IPV6_ADDR_SCOPE_SITELOCAL -#define __IPV6_ADDR_SCOPE_SITELOCAL 0x05 -#endif -#ifndef __IPV6_ADDR_SCOPE_ORGLOCAL -#define __IPV6_ADDR_SCOPE_ORGLOCAL 0x08 -#endif - -#ifndef IN6_IS_ADDR_MC_SITELOCAL -#define IN6_IS_ADDR_MC_SITELOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL)) -#endif - -#ifndef IN6_IS_ADDR_MC_ORGLOCAL -#define IN6_IS_ADDR_MC_ORGLOCAL(a) \ - (IN6_IS_ADDR_MULTICAST(a) && \ - (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL)) -#endif - -#ifndef INADDR_NONE -#define INADDR_NONE 0xffffffff -#endif - -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 256 -#endif - -#ifndef INET6_ADDRSTRLEN -/* sizeof("aaaa:bbbb:cccc:dddd:eeee:ffff:123.123.123.123") */ -#define INET6_ADDRSTRLEN 46 -#endif - -#ifndef MIN -#define MIN(x,y) (((x) <= (y)) ? (x) : (y)) -#endif - -#ifndef MAX -#define MAX(x,y) (((x) >= (y)) ? (x) : (y)) -#endif - -#ifdef NEED_DAEMON -int daemon(int nochdir, int noclose); -#endif - -#ifdef NEED_STRSEP -char * strsep(char **stringp, const char *delim); -#endif - -#ifndef ALIGN -#define ALIGN(p) (((uintptr_t)(p) + (sizeof(long) - 1)) & ~(sizeof(long) - 1)) -#endif - -#ifdef NEED_SETGROUPENT -int setgroupent(int stayopen); -#endif - -#ifdef NEED_GETGROUPLIST -int getgrouplist(GETGROUPLIST_ARGS); -#endif - -#ifdef POSIX_GETGRNAM_R -int -__posix_getgrnam_r(const char *, struct group *, char *, int, struct group **); -#endif - -#ifdef NEED_GETGRNAM_R -int -getgrnam_r(const char *, struct group *, char *, size_t, struct group **); -#endif - -#ifdef POSIX_GETGRGID_R -int -__posix_getgrgid_r(gid_t, struct group *, char *, int, struct group **) ; -#endif - -#ifdef NEED_GETGRGID_R -int -getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); -#endif - -#ifdef NEED_GETGRENT_R -GROUP_R_RETURN getgrent_r(struct group *gptr, GROUP_R_ARGS); -#endif - -#ifdef NEED_SETGRENT_R -GROUP_R_SET_RETURN setgrent_r(GROUP_R_ENT_ARGS); -#endif - -#ifdef NEED_ENDGRENT_R -GROUP_R_END_RETURN endgrent_r(GROUP_R_ENT_ARGS); -#endif - -#if defined(NEED_INNETGR_R) && defined(NGR_R_RETURN) -NGR_R_RETURN -innetgr_r(const char *, const char *, const char *, const char *); -#endif - -#ifdef NEED_SETNETGRENT_R -#ifdef NGR_R_SET_ARGS -NGR_R_SET_RETURN setnetgrent_r(NGR_R_SET_CONST char *netgroup, NGR_R_SET_ARGS); -#else -NGR_R_SET_RETURN setnetgrent_r(NGR_R_SET_CONST char *netgroup); -#endif -#endif - -#ifdef NEED_ENDNETGRENT_R -#ifdef NGR_R_END_ARGS -NGR_R_END_RETURN endnetgrent_r(NGR_R_END_ARGS); -#else -NGR_R_END_RETURN endnetgrent_r(void); -#endif -#endif - -#ifdef POSIX_GETPWNAM_R -int -__posix_getpwnam_r(const char *login, struct passwd *pwptr, - char *buf, size_t buflen, struct passwd **result); -#endif - -#ifdef NEED_GETPWNAM_R -int -getpwnam_r(const char *login, struct passwd *pwptr, - char *buf, size_t buflen, struct passwd **result); -#endif - -#ifdef POSIX_GETPWUID_R -int -__posix_getpwuid_r(uid_t uid, struct passwd *pwptr, - char *buf, int buflen, struct passwd **result); -#endif - -#ifdef NEED_GETPWUID_R -int -getpwuid_r(uid_t uid, struct passwd *pwptr, - char *buf, size_t buflen, struct passwd **result); -#endif - -#ifdef NEED_SETPWENT_R -#ifdef PASS_R_ENT_ARGS -PASS_R_SET_RETURN setpwent_r(PASS_R_ENT_ARGS); -#else -PASS_R_SET_RETURN setpwent_r(void); -#endif - -#endif - -#ifdef NEED_SETPASSENT_R -#ifdef PASS_R_ENT_ARGS -PASS_R_SET_RETURN setpassent_r(int stayopen, PASS_R_ENT_ARGS); -#else -PASS_R_SET_RETURN setpassent_r(int stayopen); -#endif -#endif - -#ifdef NEED_GETPWENT_R -PASS_R_RETURN getpwent_r(struct passwd *pwptr, PASS_R_ARGS); -#endif - -#ifdef NEED_ENDPWENT_R -void endpwent_r(void); -#endif - -#ifdef NEED_SETPASSENT -int setpassent(int stayopen); -#endif - -#define gettimeofday isc__gettimeofday -#ifdef NEED_GETTIMEOFDAY -int isc__gettimeofday(struct timeval *tvp, struct _TIMEZONE *tzp); -#else -int isc__gettimeofday(struct timeval *tp, struct timezone *tzp); -#endif - -int getnetgrent(NGR_R_CONST char **machinep, NGR_R_CONST char **userp, - NGR_R_CONST char **domainp); - -#ifdef NGR_R_ARGS -int getnetgrent_r(NGR_R_CONST char **machinep, NGR_R_CONST char **userp, - NGR_R_CONST char **domainp, NGR_R_ARGS); -#endif - -#ifdef SETNETGRENT_ARGS -void setnetgrent(SETNETGRENT_ARGS); -#else -void setnetgrent(const char *netgroup); -#endif - -void endnetgrent(void); - -#ifdef INNETGR_ARGS -int innetgr(INNETGR_ARGS); -#else -int innetgr(const char *netgroup, const char *machine, - const char *user, const char *domain); -#endif - -#ifdef NGR_R_SET_ARGS -NGR_R_SET_RETURN -setnetgrent_r(NGR_R_SET_CONST char *netgroup, NGR_R_SET_ARGS); -#else -NGR_R_SET_RETURN -setnetgrent_r(NGR_R_SET_CONST char *netgroup); -#endif - -#ifdef NEED_STRTOUL -unsigned long strtoul(const char *, char **, int); -#endif - -#ifdef NEED_SUN4PROTOS -#include <stdarg.h> -#ifndef __SIZE_TYPE__ -#define __SIZE_TYPE__ int -#endif -struct sockaddr; -struct iovec; -struct timeval; -struct timezone; -int fprintf(FILE *, const char *, ...); -int getsockname(int, struct sockaddr *, int *); -int getpeername(int, struct sockaddr *, int *); -int socket(int, int, int); -int connect(int, const struct sockaddr *, int); -int writev(int, struct iovec *, int); -int readv(int, struct iovec *, int); -int send(int, const char *, int, int); -void bzero(char *, int); -int recvfrom(int, char *, int, int, struct sockaddr *, int *); -int syslog(int, const char *, ... ); -int printf(const char *, ...); -__SIZE_TYPE__ fread(void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *); -__SIZE_TYPE__ fwrite(const void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *); -int fclose(FILE *); -int ungetc(int, FILE *); -int scanf(const char *, ...); -int sscanf(const char *, const char *, ... ); -int tolower(int); -int toupper(int); -int strcasecmp(const char *, const char *); -int strncasecmp(const char *, const char *, int); -int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); -#ifdef gettimeofday -#undef gettimeofday -int gettimeofday(struct timeval *, struct timezone *); -#define gettimeofday isc__gettimeofday -#else -int gettimeofday(struct timeval *, struct timezone *); -#endif -long strtol(const char*, char **, int); -int fseek(FILE *, long, int); -int setsockopt(int, int, int, const char *, int); -int bind(int, const struct sockaddr *, int); -void bcopy(char *, char *, int); -int fputc(char, FILE *); -int listen(int, int); -int accept(int, struct sockaddr *, int *); -int getsockopt(int, int, int, char *, int *); -int vfprintf(FILE *, const char *, va_list); -int fflush(FILE *); -int fgetc(FILE *); -int fputs(const char *, FILE *); -int fchown(int, int, int); -void setbuf(FILE *, char *); -int gethostname(char *, int); -int rename(const char *, const char *); -time_t time(time_t *); -int fscanf(FILE *, const char *, ...); -int sscanf(const char *, const char *, ...); -int ioctl(int, int, caddr_t); -void perror(const char *); - -#if !defined(__USE_FIXED_PROTOTYPES__) && !defined(__cplusplus) && !defined(__STRICT_ANSI__) -/* - * 'gcc -ansi' changes the prototype for vsprintf(). - * Use this prototype when 'gcc -ansi' is not in effect. - */ -char *vsprintf(char *, const char *, va_list); -#endif -#endif - -#endif diff --git a/lib/bind/bind/port_before.h b/lib/bind/bind/port_before.h deleted file mode 100644 index 37dfac7..0000000 --- a/lib/bind/bind/port_before.h +++ /dev/null @@ -1,175 +0,0 @@ -/* $FreeBSD$ */ - -#ifndef port_before_h -#define port_before_h -#include <config.h> - -#ifdef NEED_SUN4PROTOS -#define _PARAMS(x) x -#endif - -struct group; /* silence warning */ -struct passwd; /* silence warning */ -struct timeval; /* silence warning */ -struct timezone; /* silence warning */ - -#ifdef HAVE_SYS_TIMERS_H -#include <sys/timers.h> -#endif -#include <limits.h> - -#ifdef ISC_PLATFORM_NEEDTIMESPEC -#include <time.h> /* For time_t */ -struct timespec { - time_t tv_sec; /* seconds */ - long tv_nsec; /* nanoseconds */ -}; -#endif -#ifndef HAVE_MEMMOVE -#define memmove(a,b,c) bcopy(b,a,c) -#endif - -#undef WANT_IRS_GR -#undef WANT_IRS_NIS -#undef WANT_IRS_PW - -#undef BSD_COMP -#undef HAVE_POLL -#undef HAVE_MD5 -#undef SOLARIS2 - -#define DO_PTHREADS 1 -#define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, int *ngroups -#define GETNETBYADDR_ADDR_T unsigned long int -#define SETPWENT_VOID 1 -#undef SETGRENT_VOID - -#define NET_R_ARGS char *buf, size_t buflen, struct netent **answerp, int *h_errnop -#define NET_R_BAD ERANGE -#define NET_R_COPY buf, buflen -#define NET_R_COPY_ARGS char *buf, size_t buflen -#define NET_R_END_RESULT(x) /*empty*/ -#define NET_R_END_RETURN void -#undef NET_R_ENT_ARGS /*empty*/ -#define NET_R_OK 0 -#define NET_R_RETURN int -#undef NET_R_SET_RESULT /*empty*/ -#define NET_R_SETANSWER 1 -#define NET_R_SET_RETURN void -#undef NETENT_DATA - - -#define GROUP_R_SET_RETURN void -#undef GROUP_R_SET_RESULT /*empty*/ -#define GROUP_R_END_RETURN void -#define GROUP_R_END_RESULT(x) /*empty*/ - -#define GROUP_R_ENT_ARGS void - - - -#define HOST_R_ARGS char *buf, size_t buflen, struct hostent **answerp, int *h_errnop -#define HOST_R_BAD ERANGE -#define HOST_R_COPY buf, buflen -#define HOST_R_COPY_ARGS char *buf, int buflen -#define HOST_R_END_RESULT(x) /*empty*/ -#define HOST_R_END_RETURN void -#undef HOST_R_ENT_ARGS /*empty*/ -#define HOST_R_ERRNO *h_errnop = h_errno -#define HOST_R_OK 0 -#define HOST_R_RETURN int -#define HOST_R_SETANSWER 1 -#undef HOST_R_SET_RESULT -#define HOST_R_SET_RETURN void -#undef HOSTENT_DATA - -#define NGR_R_ARGS char *buf, int buflen -#define NGR_R_BAD (0) -#define NGR_R_COPY buf, buflen -#define NGR_R_COPY_ARGS NGR_R_ARGS -#define NGR_R_CONST -#define NGR_R_END_RESULT(x) /*empty*/ -#define NGR_R_END_RETURN void -#undef NGR_R_END_ARGS /*empty*/ -#define NGR_R_OK 1 -#define NGR_R_RETURN int -#define NGR_R_SET_CONST const -#undef NGR_R_SET_RESULT /*empty*/ -#define NGR_R_SET_RETURN void -#undef NGR_R_SET_ARGS - - -#if !defined(NGR_R_SET_ARGS) && defined(NGR_R_END_ARGS) -#define NGR_R_SET_ARGS NGR_R_END_ARGS -#endif - -#define PROTO_R_ARGS char *buf, size_t buflen, struct protoent **answerp -#define PROTO_R_BAD ERANGE -#define PROTO_R_COPY buf, buflen -#define PROTO_R_COPY_ARGS char *buf, size_t buflen -#define PROTO_R_END_RESULT(x) /*empty*/ -#define PROTO_R_END_RETURN void -#undef PROTO_R_ENT_ARGS /*empty*/ -#undef PROTO_R_ENT_UNUSED -#define PROTO_R_OK 0 -#define PROTO_R_SETANSWER 1 -#define PROTO_R_RETURN int -#undef PROTO_R_SET_RESULT -#define PROTO_R_SET_RETURN void -#undef PROTOENT_DATA - - - - - -#define PASS_R_END_RESULT(x) /*empty*/ -#define PASS_R_END_RETURN void -#undef PASS_R_ENT_ARGS - - -#undef PASS_R_SET_RESULT /*empty*/ -#define PASS_R_SET_RETURN void - -#define SERV_R_ARGS char *buf, size_t buflen, struct servent **answerp -#define SERV_R_BAD ERANGE -#define SERV_R_COPY buf, buflen -#define SERV_R_COPY_ARGS char *buf, size_t buflen -#define SERV_R_END_RESULT(x) /*empty*/ -#define SERV_R_END_RETURN void -#undef SERV_R_ENT_ARGS /*empty*/ -#undef SERV_R_ENT_UNUSED /*empty*/ -#define SERV_R_OK (0) -#define SERV_R_SETANSWER 1 -#define SERV_R_RETURN int -#undef SERV_R_SET_RESULT -#define SERV_R_SET_RETURN void - - - -#define DE_CONST(konst, var) \ - do { \ - union { const void *k; void *v; } _u; \ - _u.k = konst; \ - var = _u.v; \ - } while (0) - -#define UNUSED(x) (x) = (x) - -#undef NEED_SOLARIS_BITTYPES -#define ISC_SOCKLEN_T socklen_t - -#ifdef __GNUC__ -#define ISC_FORMAT_PRINTF(fmt, args) \ - __attribute__((__format__(__printf__, fmt, args))) -#else -#define ISC_FORMAT_PRINTF(fmt, args) -#endif - -/* Pull in host order macros when _XOPEN_SOURCE_EXTENDED is defined. */ -#if defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED) -#include <sys/byteorder.h> -#endif - -#endif - -/*! \file */ diff --git a/lib/bind/config.h b/lib/bind/config.h index aa372de..8e52426 100644 --- a/lib/bind/config.h +++ b/lib/bind/config.h @@ -3,10 +3,10 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -19,7 +19,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: acconfig.h,v 1.44.18.5 2005/04/29 00:15:20 marka Exp $ */ +/* $Id: acconfig.h,v 1.51.334.2 2009/02/16 23:47:15 tbox Exp $ */ /*! \file */ @@ -28,9 +28,6 @@ *** it does not get installed. ***/ -/** define to `int' if <sys/types.h> doesn't define. */ -/* #undef ssize_t */ - /** define on DEC OSF to enable 4.4BSD style sa_len support */ /* #undef _SOCKADDR_LEN */ @@ -64,9 +61,6 @@ /** define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */ #define HAVE_IFLIST_SYSCTL 1 -/** define if chroot() is available */ -#define HAVE_CHROOT 1 - /** define if tzset() is available */ #define HAVE_TZSET 1 @@ -118,7 +112,7 @@ int sigwait(const unsigned int *set, int *sig); * The silly continuation line is to keep configure from * commenting out the #undef. */ - + #undef \ va_start #define va_start(ap, last) \ @@ -160,24 +154,36 @@ int sigwait(const unsigned int *set, int *sig); /* Define if you cannot bind() before connect() for TCP sockets. */ /* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */ +/* Define to enable "rrset-order fixed" syntax. */ +/* #undef DNS_RDATASET_FIXED */ + /* Solaris hack to get select_large_fdset. */ /* #undef FD_SETSIZE */ -/* Define to 1 if you have the `capset' function. */ -/* #undef HAVE_CAPSET */ +/* Define to 1 if you have the `chroot' function. */ +#define HAVE_CHROOT 1 /* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if you have the <gssapi/gssapi.h> header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ + +/* Define to 1 if you have the <gssapi.h> header file. */ +/* #undef HAVE_GSSAPI_H */ + /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `c' library (-lc). */ /* #undef HAVE_LIBC */ +/* Define to 1 if you have the `cap' library (-lcap). */ +/* #undef HAVE_LIBCAP */ + /* Define to 1 if you have the `c_r' library (-lc_r). */ /* #undef HAVE_LIBC_R */ @@ -196,6 +202,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the `thr' library (-lthr). */ /* #undef HAVE_LIBTHR */ +/* Define if libxml2 was found */ +/* #undef HAVE_LIBXML2 */ + /* Define to 1 if you have the <linux/capability.h> header file. */ /* #undef HAVE_LINUX_CAPABILITY_H */ @@ -205,6 +214,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the `nanosleep' function. */ +#define HAVE_NANOSLEEP 1 + /* Define to 1 if you have the <net/if6.h> header file. */ /* #undef HAVE_NET_IF6_H */ diff --git a/lib/bind/dns/Makefile b/lib/bind/dns/Makefile index 6850098..72b9f80 100644 --- a/lib/bind/dns/Makefile +++ b/lib/bind/dns/Makefile @@ -19,12 +19,13 @@ SRCS+= acache.c acl.c adb.c byaddr.c \ dst_api.c dst_lib.c dst_parse.c dst_result.c \ forward.c \ gssapi_link.c gssapictx.c hmac_link.c \ + iptable.c \ journal.c \ key.c \ keytable.c \ lib.c log.c lookup.c \ master.c masterdump.c message.c \ - name.c ncache.c nsec.c \ + name.c ncache.c nsec.c nsec3.c \ openssl_link.c openssldh_link.c \ openssldsa_link.c opensslrsa_link.c \ order.c peer.c portlist.c \ @@ -64,6 +65,7 @@ DNSINCS= ${SRCDIR}/include/dns/acache.h \ ${SRCDIR}/include/dns/events.h \ ${SRCDIR}/include/dns/fixedname.h \ ${SRCDIR}/include/dns/forward.h \ + ${SRCDIR}/include/dns/iptable.h \ ${SRCDIR}/include/dns/journal.h \ ${SRCDIR}/include/dns/keyflags.h \ ${SRCDIR}/include/dns/keytable.h \ @@ -77,6 +79,7 @@ DNSINCS= ${SRCDIR}/include/dns/acache.h \ ${SRCDIR}/include/dns/name.h \ ${SRCDIR}/include/dns/ncache.h \ ${SRCDIR}/include/dns/nsec.h \ + ${SRCDIR}/include/dns/nsec3.h \ ${SRCDIR}/include/dns/opcode.h \ ${SRCDIR}/include/dns/order.h \ ${SRCDIR}/include/dns/peer.h \ diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h index 44ce599..db8d8c5 100644 --- a/lib/bind/dns/code.h +++ b/lib/bind/dns/code.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -80,6 +80,9 @@ #include "rdata/generic/rrsig_46.c" #include "rdata/generic/nsec_47.c" #include "rdata/generic/dnskey_48.c" +#include "rdata/in_1/dhcid_49.c" +#include "rdata/generic/nsec3_50.c" +#include "rdata/generic/nsec3param_51.c" #include "rdata/generic/spf_99.c" #include "rdata/generic/unspec_103.c" #include "rdata/generic/tkey_249.c" @@ -180,6 +183,13 @@ case 46: result = fromtext_rrsig(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 47: result = fromtext_nsec(rdclass, type, lexer, origin, options, target, callbacks); break; \ case 48: result = fromtext_dnskey(rdclass, type, lexer, origin, options, target, callbacks); break; \ + case 49: switch (rdclass) { \ + case 1: result = fromtext_in_dhcid(rdclass, type, lexer, origin, options, target, callbacks); break; \ + default: result = DNS_R_UNKNOWN; break; \ + } \ + break; \ + 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 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 249: result = fromtext_tkey(rdclass, type, lexer, origin, options, target, callbacks); break; \ @@ -284,6 +294,13 @@ case 46: result = totext_rrsig(rdata, tctx, target); break; \ case 47: result = totext_nsec(rdata, tctx, target); break; \ case 48: result = totext_dnskey(rdata, tctx, target); break; \ + case 49: switch (rdata->rdclass) { \ + case 1: result = totext_in_dhcid(rdata, tctx, target); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = totext_nsec3(rdata, tctx, target); break; \ + case 51: result = totext_nsec3param(rdata, tctx, target); break; \ case 99: result = totext_spf(rdata, tctx, target); break; \ case 103: result = totext_unspec(rdata, tctx, target); break; \ case 249: result = totext_tkey(rdata, tctx, target); break; \ @@ -388,6 +405,13 @@ case 46: result = fromwire_rrsig(rdclass, type, source, dctx, options, target); break; \ case 47: result = fromwire_nsec(rdclass, type, source, dctx, options, target); break; \ case 48: result = fromwire_dnskey(rdclass, type, source, dctx, options, target); break; \ + case 49: switch (rdclass) { \ + case 1: result = fromwire_in_dhcid(rdclass, type, source, dctx, options, target); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + 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 99: result = fromwire_spf(rdclass, type, source, dctx, options, target); break; \ case 103: result = fromwire_unspec(rdclass, type, source, dctx, options, target); break; \ case 249: result = fromwire_tkey(rdclass, type, source, dctx, options, target); break; \ @@ -492,6 +516,13 @@ case 46: result = towire_rrsig(rdata, cctx, target); break; \ case 47: result = towire_nsec(rdata, cctx, target); break; \ case 48: result = towire_dnskey(rdata, cctx, target); break; \ + case 49: switch (rdata->rdclass) { \ + case 1: result = towire_in_dhcid(rdata, cctx, target); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = towire_nsec3(rdata, cctx, target); break; \ + case 51: result = towire_nsec3param(rdata, cctx, target); break; \ case 99: result = towire_spf(rdata, cctx, target); break; \ case 103: result = towire_unspec(rdata, cctx, target); break; \ case 249: result = towire_tkey(rdata, cctx, target); break; \ @@ -596,6 +627,13 @@ case 46: result = compare_rrsig(rdata1, rdata2); break; \ case 47: result = compare_nsec(rdata1, rdata2); break; \ case 48: result = compare_dnskey(rdata1, rdata2); break; \ + case 49: switch (rdata1->rdclass) { \ + case 1: result = compare_in_dhcid(rdata1, rdata2); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = compare_nsec3(rdata1, rdata2); break; \ + case 51: result = compare_nsec3param(rdata1, rdata2); break; \ case 99: result = compare_spf(rdata1, rdata2); break; \ case 103: result = compare_unspec(rdata1, rdata2); break; \ case 249: result = compare_tkey(rdata1, rdata2); break; \ @@ -700,6 +738,13 @@ case 46: result = fromstruct_rrsig(rdclass, type, source, target); break; \ case 47: result = fromstruct_nsec(rdclass, type, source, target); break; \ case 48: result = fromstruct_dnskey(rdclass, type, source, target); break; \ + case 49: switch (rdclass) { \ + case 1: result = fromstruct_in_dhcid(rdclass, type, source, target); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = fromstruct_nsec3(rdclass, type, source, target); break; \ + case 51: result = fromstruct_nsec3param(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 249: result = fromstruct_tkey(rdclass, type, source, target); break; \ @@ -804,6 +849,13 @@ case 46: result = tostruct_rrsig(rdata, target, mctx); break; \ case 47: result = tostruct_nsec(rdata, target, mctx); break; \ case 48: result = tostruct_dnskey(rdata, target, mctx); break; \ + case 49: switch (rdata->rdclass) { \ + case 1: result = tostruct_in_dhcid(rdata, target, mctx); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = tostruct_nsec3(rdata, target, mctx); break; \ + case 51: result = tostruct_nsec3param(rdata, target, mctx); break; \ case 99: result = tostruct_spf(rdata, target, mctx); break; \ case 103: result = tostruct_unspec(rdata, target, mctx); break; \ case 249: result = tostruct_tkey(rdata, target, mctx); break; \ @@ -908,6 +960,13 @@ case 46: freestruct_rrsig(source); break; \ case 47: freestruct_nsec(source); break; \ case 48: freestruct_dnskey(source); break; \ + case 49: switch (common->rdclass) { \ + case 1: freestruct_in_dhcid(source); break; \ + default: break; \ + } \ + break; \ + case 50: freestruct_nsec3(source); break; \ + case 51: freestruct_nsec3param(source); break; \ case 99: freestruct_spf(source); break; \ case 103: freestruct_unspec(source); break; \ case 249: freestruct_tkey(source); break; \ @@ -1012,6 +1071,13 @@ case 46: result = additionaldata_rrsig(rdata, add, arg); break; \ case 47: result = additionaldata_nsec(rdata, add, arg); break; \ case 48: result = additionaldata_dnskey(rdata, add, arg); break; \ + case 49: switch (rdata->rdclass) { \ + case 1: result = additionaldata_in_dhcid(rdata, add, arg); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = additionaldata_nsec3(rdata, add, arg); break; \ + case 51: result = additionaldata_nsec3param(rdata, add, arg); break; \ case 99: result = additionaldata_spf(rdata, add, arg); break; \ case 103: result = additionaldata_unspec(rdata, add, arg); break; \ case 249: result = additionaldata_tkey(rdata, add, arg); break; \ @@ -1116,6 +1182,13 @@ case 46: result = digest_rrsig(rdata, digest, arg); break; \ case 47: result = digest_nsec(rdata, digest, arg); break; \ case 48: result = digest_dnskey(rdata, digest, arg); break; \ + case 49: switch (rdata->rdclass) { \ + case 1: result = digest_in_dhcid(rdata, digest, arg); break; \ + default: use_default = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = digest_nsec3(rdata, digest, arg); break; \ + case 51: result = digest_nsec3param(rdata, digest, arg); break; \ case 99: result = digest_spf(rdata, digest, arg); break; \ case 103: result = digest_unspec(rdata, digest, arg); break; \ case 249: result = digest_tkey(rdata, digest, arg); break; \ @@ -1220,6 +1293,13 @@ case 46: result = checkowner_rrsig(name, rdclass, type, wildcard); break; \ case 47: result = checkowner_nsec(name, rdclass, type, wildcard); break; \ case 48: result = checkowner_dnskey(name, rdclass, type, wildcard); break; \ + case 49: switch (rdclass) { \ + case 1: result = checkowner_in_dhcid(name, rdclass, type, wildcard); break; \ + default: result = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = checkowner_nsec3(name, rdclass, type, wildcard); break; \ + case 51: result = checkowner_nsec3param(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 249: result = checkowner_tkey(name, rdclass, type, wildcard); break; \ @@ -1324,6 +1404,13 @@ case 46: result = checknames_rrsig(rdata, owner, bad); break; \ case 47: result = checknames_nsec(rdata, owner, bad); break; \ case 48: result = checknames_dnskey(rdata, owner, bad); break; \ + case 49: switch (rdata->rdclass) { \ + case 1: result = checknames_in_dhcid(rdata, owner, bad); break; \ + default: result = ISC_TRUE; break; \ + } \ + break; \ + case 50: result = checknames_nsec3(rdata, owner, bad); break; \ + case 51: result = checknames_nsec3param(rdata, owner, bad); break; \ case 99: result = checknames_spf(rdata, owner, bad); break; \ case 103: result = checknames_unspec(rdata, owner, bad); break; \ case 249: result = checknames_tkey(rdata, owner, bad); break; \ @@ -1383,6 +1470,7 @@ case 24: \ RDATATYPE_COMPARE("null", 10, _typename, _length, _typep); \ RDATATYPE_COMPARE("kx", 36, _typename, _length, _typep); \ + RDATATYPE_COMPARE("nsec3param", 51, _typename, _length, _typep); \ break; \ case 206: \ RDATATYPE_COMPARE("wks", 11, _typename, _length, _typep); \ @@ -1485,8 +1573,12 @@ RDATATYPE_COMPARE("dnskey", 48, _typename, _length, _typep); \ break; \ case 4: \ + RDATATYPE_COMPARE("dhcid", 49, _typename, _length, _typep); \ RDATATYPE_COMPARE("spf", 99, _typename, _length, _typep); \ break; \ + case 233: \ + RDATATYPE_COMPARE("nsec3", 50, _typename, _length, _typep); \ + break; \ case 230: \ RDATATYPE_COMPARE("uinfo", 100, _typename, _length, _typep); \ break; \ @@ -1568,6 +1660,9 @@ case 46: return (RRTYPE_RRSIG_ATTRIBUTES); \ case 47: return (RRTYPE_NSEC_ATTRIBUTES); \ case 48: return (RRTYPE_DNSKEY_ATTRIBUTES); \ + case 49: return (RRTYPE_DHCID_ATTRIBUTES); \ + case 50: return (RRTYPE_NSEC3_ATTRIBUTES); \ + case 51: return (RRTYPE_NSEC3PARAM_ATTRIBUTES); \ case 99: return (RRTYPE_SPF_ATTRIBUTES); \ case 100: return (DNS_RDATATYPEATTR_RESERVED); \ case 101: return (DNS_RDATATYPEATTR_RESERVED); \ @@ -1632,6 +1727,9 @@ case 46: return (str_totext("RRSIG", target)); \ case 47: return (str_totext("NSEC", target)); \ case 48: return (str_totext("DNSKEY", target)); \ + case 49: return (str_totext("DHCID", target)); \ + case 50: return (str_totext("NSEC3", target)); \ + case 51: return (str_totext("NSEC3PARAM", target)); \ case 99: return (str_totext("SPF", target)); \ case 100: return (str_totext("UINFO", target)); \ case 101: return (str_totext("UID", target)); \ diff --git a/lib/bind/dns/dns/enumclass.h b/lib/bind/dns/dns/enumclass.h index 6624e90..b1e363f 100644 --- a/lib/bind/dns/dns/enumclass.h +++ b/lib/bind/dns/dns/enumclass.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any diff --git a/lib/bind/dns/dns/enumtype.h b/lib/bind/dns/dns/enumtype.h index fd911e3..74a6db7 100644 --- a/lib/bind/dns/dns/enumtype.h +++ b/lib/bind/dns/dns/enumtype.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -75,6 +75,9 @@ enum { dns_rdatatype_rrsig = 46, dns_rdatatype_nsec = 47, dns_rdatatype_dnskey = 48, + dns_rdatatype_dhcid = 49, + dns_rdatatype_nsec3 = 50, + dns_rdatatype_nsec3param = 51, dns_rdatatype_spf = 99, dns_rdatatype_unspec = 103, dns_rdatatype_tkey = 249, @@ -132,6 +135,9 @@ enum { #define dns_rdatatype_rrsig ((dns_rdatatype_t)dns_rdatatype_rrsig) #define dns_rdatatype_nsec ((dns_rdatatype_t)dns_rdatatype_nsec) #define dns_rdatatype_dnskey ((dns_rdatatype_t)dns_rdatatype_dnskey) +#define dns_rdatatype_dhcid ((dns_rdatatype_t)dns_rdatatype_dhcid) +#define dns_rdatatype_nsec3 ((dns_rdatatype_t)dns_rdatatype_nsec3) +#define dns_rdatatype_nsec3param ((dns_rdatatype_t)dns_rdatatype_nsec3param) #define dns_rdatatype_spf ((dns_rdatatype_t)dns_rdatatype_spf) #define dns_rdatatype_unspec ((dns_rdatatype_t)dns_rdatatype_unspec) #define dns_rdatatype_tkey ((dns_rdatatype_t)dns_rdatatype_tkey) diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h index 8d4ed99..d723941 100644 --- a/lib/bind/dns/dns/rdatastruct.h +++ b/lib/bind/dns/dns/rdatastruct.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -27,10 +27,10 @@ /*! \file */ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -43,7 +43,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdatastructpre.h,v 1.14 2004/03/05 05:10:04 marka Exp $ */ +/* $Id: rdatastructpre.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */ #ifndef DNS_RDATASTRUCT_H #define DNS_RDATASTRUCT_H 1 @@ -69,10 +69,10 @@ typedef struct dns_rdatacommon { ISC_LINK_INIT(&(_data)->common, link); \ } while (0) /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -89,7 +89,7 @@ typedef struct dns_rdatacommon { #ifndef IN_1_A_1_H #define IN_1_A_1_H 1 -/* $Id: a_1.h,v 1.24.18.2 2005/04/29 00:16:41 marka 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; @@ -98,9 +98,9 @@ typedef struct dns_rdata_in_a { #endif /* IN_1_A_1_H */ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -113,7 +113,7 @@ typedef struct dns_rdata_in_a { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a_1.h,v 1.2.2.2 2005/06/05 00:02:22 marka Exp $ */ +/* $Id: a_1.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */ /* by Bjorn.Victor@it.uu.se, 2005-05-07 */ /* Based on generic/mx_15.h */ @@ -132,10 +132,10 @@ typedef struct dns_rdata_ch_a { #endif /* CH_3_A_1_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -152,7 +152,7 @@ typedef struct dns_rdata_ch_a { #ifndef HS_4_A_1_H #define HS_4_A_1_H 1 -/* $Id: a_1.h,v 1.8.18.2 2005/04/29 00:16:41 marka 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; @@ -161,10 +161,10 @@ typedef struct dns_rdata_hs_a { #endif /* HS_4_A_1_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -181,7 +181,7 @@ typedef struct dns_rdata_hs_a { #ifndef GENERIC_NS_2_H #define GENERIC_NS_2_H 1 -/* $Id: ns_2.h,v 1.23.18.2 2005/04/29 00:16:37 marka 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; @@ -192,10 +192,10 @@ typedef struct dns_rdata_ns { #endif /* GENERIC_NS_2_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -212,7 +212,7 @@ typedef struct dns_rdata_ns { #ifndef GENERIC_MD_3_H #define GENERIC_MD_3_H 1 -/* $Id: md_3.h,v 1.24.18.2 2005/04/29 00:16:35 marka 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; @@ -223,10 +223,10 @@ typedef struct dns_rdata_md { #endif /* GENERIC_MD_3_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -243,7 +243,7 @@ typedef struct dns_rdata_md { #ifndef GENERIC_MF_4_H #define GENERIC_MF_4_H 1 -/* $Id: mf_4.h,v 1.22.18.2 2005/04/29 00:16:35 marka 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; @@ -253,10 +253,10 @@ typedef struct dns_rdata_mf { #endif /* GENERIC_MF_4_H */ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -269,7 +269,7 @@ typedef struct dns_rdata_mf { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cname_5.h,v 1.24 2004/03/05 05:10:10 marka 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 @@ -282,10 +282,10 @@ typedef struct dns_rdata_cname { #endif /* GENERIC_CNAME_5_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -302,7 +302,7 @@ typedef struct dns_rdata_cname { #ifndef GENERIC_SOA_6_H #define GENERIC_SOA_6_H 1 -/* $Id: soa_6.h,v 1.28.18.2 2005/04/29 00:16:40 marka 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; @@ -319,10 +319,10 @@ typedef struct dns_rdata_soa { #endif /* GENERIC_SOA_6_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -339,7 +339,7 @@ typedef struct dns_rdata_soa { #ifndef GENERIC_MB_7_H #define GENERIC_MB_7_H 1 -/* $Id: mb_7.h,v 1.23.18.2 2005/04/29 00:16:34 marka 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; @@ -349,10 +349,10 @@ typedef struct dns_rdata_mb { #endif /* GENERIC_MB_7_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -369,7 +369,7 @@ typedef struct dns_rdata_mb { #ifndef GENERIC_MG_8_H #define GENERIC_MG_8_H 1 -/* $Id: mg_8.h,v 1.22.18.2 2005/04/29 00:16:35 marka 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; @@ -379,10 +379,10 @@ typedef struct dns_rdata_mg { #endif /* GENERIC_MG_8_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -399,7 +399,7 @@ typedef struct dns_rdata_mg { #ifndef GENERIC_MR_9_H #define GENERIC_MR_9_H 1 -/* $Id: mr_9.h,v 1.22.18.2 2005/04/29 00:16:36 marka 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; @@ -409,10 +409,10 @@ typedef struct dns_rdata_mr { #endif /* GENERIC_MR_9_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -429,7 +429,7 @@ typedef struct dns_rdata_mr { #ifndef GENERIC_NULL_10_H #define GENERIC_NULL_10_H 1 -/* $Id: null_10.h,v 1.21.18.2 2005/04/29 00:16:37 marka 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; @@ -441,10 +441,10 @@ typedef struct dns_rdata_null { #endif /* GENERIC_NULL_10_H */ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -460,7 +460,7 @@ typedef struct dns_rdata_null { #ifndef IN_1_WKS_11_H #define IN_1_WKS_11_H 1 -/* $Id: wks_11.h,v 1.20 2004/03/05 05:10:25 marka 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; @@ -473,10 +473,10 @@ typedef struct dns_rdata_in_wks { #endif /* IN_1_WKS_11_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -493,7 +493,7 @@ typedef struct dns_rdata_in_wks { #ifndef GENERIC_PTR_12_H #define GENERIC_PTR_12_H 1 -/* $Id: ptr_12.h,v 1.23.18.2 2005/04/29 00:16:39 marka 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; @@ -503,10 +503,10 @@ typedef struct dns_rdata_ptr { #endif /* GENERIC_PTR_12_H */ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -522,7 +522,7 @@ typedef struct dns_rdata_ptr { #ifndef GENERIC_HINFO_13_H #define GENERIC_HINFO_13_H 1 -/* $Id: hinfo_13.h,v 1.23 2004/03/05 05:10:12 marka 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; @@ -535,10 +535,10 @@ typedef struct dns_rdata_hinfo { #endif /* GENERIC_HINFO_13_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -555,7 +555,7 @@ typedef struct dns_rdata_hinfo { #ifndef GENERIC_MINFO_14_H #define GENERIC_MINFO_14_H 1 -/* $Id: minfo_14.h,v 1.23.18.2 2005/04/29 00:16:35 marka 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; @@ -566,10 +566,10 @@ typedef struct dns_rdata_minfo { #endif /* GENERIC_MINFO_14_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -586,7 +586,7 @@ typedef struct dns_rdata_minfo { #ifndef GENERIC_MX_15_H #define GENERIC_MX_15_H 1 -/* $Id: mx_15.h,v 1.25.18.2 2005/04/29 00:16:36 marka 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; @@ -597,10 +597,10 @@ typedef struct dns_rdata_mx { #endif /* GENERIC_MX_15_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -617,7 +617,7 @@ typedef struct dns_rdata_mx { #ifndef GENERIC_TXT_16_H #define GENERIC_TXT_16_H 1 -/* $Id: txt_16.h,v 1.24.18.2 2005/04/29 00:16:40 marka 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; @@ -649,10 +649,10 @@ dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *); #endif /* GENERIC_TXT_16_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -668,7 +668,7 @@ dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *); #ifndef GENERIC_RP_17_H #define GENERIC_RP_17_H 1 -/* $Id: rp_17.h,v 1.17.18.2 2005/04/29 00:16:39 marka Exp $ */ +/* $Id: rp_17.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1183 */ @@ -683,10 +683,10 @@ typedef struct dns_rdata_rp { #endif /* GENERIC_RP_17_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -702,7 +702,7 @@ typedef struct dns_rdata_rp { #ifndef GENERIC_AFSDB_18_H #define GENERIC_AFSDB_18_H 1 -/* $Id: afsdb_18.h,v 1.16.18.2 2005/04/29 00:16:30 marka Exp $ */ +/* $Id: afsdb_18.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1183 */ @@ -717,10 +717,10 @@ typedef struct dns_rdata_afsdb { #endif /* GENERIC_AFSDB_18_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -736,7 +736,7 @@ typedef struct dns_rdata_afsdb { #ifndef GENERIC_X25_19_H #define GENERIC_X25_19_H 1 -/* $Id: x25_19.h,v 1.14.18.2 2005/04/29 00:16:40 marka Exp $ */ +/* $Id: x25_19.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1183 */ @@ -750,10 +750,10 @@ typedef struct dns_rdata_x25 { #endif /* GENERIC_X25_19_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -769,7 +769,7 @@ typedef struct dns_rdata_x25 { #ifndef GENERIC_ISDN_20_H #define GENERIC_ISDN_20_H 1 -/* $Id: isdn_20.h,v 1.14.18.2 2005/04/29 00:16:33 marka Exp $ */ +/* $Id: isdn_20.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1183 */ @@ -785,10 +785,10 @@ typedef struct dns_rdata_isdn { #endif /* GENERIC_ISDN_20_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -804,7 +804,7 @@ typedef struct dns_rdata_isdn { #ifndef GENERIC_RT_21_H #define GENERIC_RT_21_H 1 -/* $Id: rt_21.h,v 1.17.18.2 2005/04/29 00:16:40 marka Exp $ */ +/* $Id: rt_21.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1183 */ @@ -818,10 +818,10 @@ typedef struct dns_rdata_rt { #endif /* GENERIC_RT_21_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -837,7 +837,7 @@ typedef struct dns_rdata_rt { #ifndef IN_1_NSAP_22_H #define IN_1_NSAP_22_H 1 -/* $Id: nsap_22.h,v 1.14.18.2 2005/04/29 00:16:43 marka Exp $ */ +/* $Id: nsap_22.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1706 */ @@ -851,10 +851,10 @@ typedef struct dns_rdata_in_nsap { #endif /* IN_1_NSAP_22_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -870,7 +870,7 @@ typedef struct dns_rdata_in_nsap { #ifndef IN_1_NSAP_PTR_23_H #define IN_1_NSAP_PTR_23_H 1 -/* $Id: nsap-ptr_23.h,v 1.15.18.2 2005/04/29 00:16:43 marka 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. */ @@ -883,10 +883,10 @@ typedef struct dns_rdata_in_nsap_ptr { #endif /* IN_1_NSAP_PTR_23_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -902,7 +902,7 @@ typedef struct dns_rdata_in_nsap_ptr { #ifndef GENERIC_SIG_24_H #define GENERIC_SIG_24_H 1 -/* $Id: sig_24.h,v 1.22.18.2 2005/04/29 00:16:40 marka Exp $ */ +/* $Id: sig_24.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2535 */ @@ -925,10 +925,10 @@ typedef struct dns_rdata_sig_t { #endif /* GENERIC_SIG_24_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -944,7 +944,7 @@ typedef struct dns_rdata_sig_t { #ifndef GENERIC_KEY_25_H #define GENERIC_KEY_25_H 1 -/* $Id: key_25.h,v 1.15.18.2 2005/04/29 00:16:33 marka Exp $ */ +/* $Id: key_25.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2535 */ @@ -962,10 +962,10 @@ typedef struct dns_rdata_key_t { #endif /* GENERIC_KEY_25_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -981,7 +981,7 @@ typedef struct dns_rdata_key_t { #ifndef IN_1_PX_26_H #define IN_1_PX_26_H 1 -/* $Id: px_26.h,v 1.15.18.2 2005/04/29 00:16:43 marka Exp $ */ +/* $Id: px_26.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2163 */ @@ -996,10 +996,10 @@ typedef struct dns_rdata_in_px { #endif /* IN_1_PX_26_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1015,7 +1015,7 @@ typedef struct dns_rdata_in_px { #ifndef GENERIC_GPOS_27_H #define GENERIC_GPOS_27_H 1 -/* $Id: gpos_27.h,v 1.13.18.2 2005/04/29 00:16:32 marka Exp $ */ +/* $Id: gpos_27.h,v 1.17 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief per RFC1712 */ @@ -1033,10 +1033,10 @@ typedef struct dns_rdata_gpos { #endif /* GENERIC_GPOS_27_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1052,7 +1052,7 @@ typedef struct dns_rdata_gpos { #ifndef IN_1_AAAA_28_H #define IN_1_AAAA_28_H 1 -/* $Id: aaaa_28.h,v 1.17.18.2 2005/04/29 00:16:42 marka Exp $ */ +/* $Id: aaaa_28.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1886 */ @@ -1064,10 +1064,10 @@ typedef struct dns_rdata_in_aaaa { #endif /* IN_1_AAAA_28_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1083,7 +1083,7 @@ typedef struct dns_rdata_in_aaaa { #ifndef GENERIC_LOC_29_H #define GENERIC_LOC_29_H 1 -/* $Id: loc_29.h,v 1.15.18.2 2005/04/29 00:16:34 marka Exp $ */ +/* $Id: loc_29.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC1876 */ @@ -1107,10 +1107,10 @@ typedef struct dns_rdata_loc { #endif /* GENERIC_LOC_29_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1126,7 +1126,7 @@ typedef struct dns_rdata_loc { #ifndef GENERIC_NXT_30_H #define GENERIC_NXT_30_H 1 -/* $Id: nxt_30.h,v 1.21.18.2 2005/04/29 00:16:38 marka Exp $ */ +/* $Id: nxt_30.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief RFC2535 */ @@ -1141,10 +1141,10 @@ typedef struct dns_rdata_nxt { #endif /* GENERIC_NXT_30_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1160,7 +1160,7 @@ typedef struct dns_rdata_nxt { #ifndef IN_1_SRV_33_H #define IN_1_SRV_33_H 1 -/* $Id: srv_33.h,v 1.15.18.2 2005/04/29 00:16:43 marka 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,10 +1178,10 @@ typedef struct dns_rdata_in_srv { #endif /* IN_1_SRV_33_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1197,7 +1197,7 @@ typedef struct dns_rdata_in_srv { #ifndef IN_1_NAPTR_35_H #define IN_1_NAPTR_35_H 1 -/* $Id: naptr_35.h,v 1.19.18.2 2005/04/29 00:16:42 marka Exp $ */ +/* $Id: naptr_35.h,v 1.23 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2915 */ @@ -1218,10 +1218,10 @@ typedef struct dns_rdata_in_naptr { #endif /* IN_1_NAPTR_35_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1237,7 +1237,7 @@ typedef struct dns_rdata_in_naptr { #ifndef IN_1_KX_36_H #define IN_1_KX_36_H 1 -/* $Id: kx_36.h,v 1.16.18.2 2005/04/29 00:16:42 marka Exp $ */ +/* $Id: kx_36.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2230 */ @@ -1251,10 +1251,10 @@ typedef struct dns_rdata_in_kx { #endif /* IN_1_KX_36_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1267,7 +1267,7 @@ typedef struct dns_rdata_in_kx { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cert_37.h,v 1.16.18.2 2005/04/29 00:16:31 marka 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 @@ -1285,10 +1285,10 @@ typedef struct dns_rdata_cert { #endif /* GENERIC_CERT_37_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1304,7 +1304,7 @@ typedef struct dns_rdata_cert { #ifndef IN_1_A6_38_H #define IN_1_A6_38_H 1 -/* $Id: a6_38.h,v 1.20.18.2 2005/04/29 00:16:41 marka Exp $ */ +/* $Id: a6_38.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2874 */ @@ -1319,10 +1319,10 @@ typedef struct dns_rdata_in_a6 { #endif /* IN_1_A6_38_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1338,7 +1338,7 @@ typedef struct dns_rdata_in_a6 { #ifndef GENERIC_DNAME_39_H #define GENERIC_DNAME_39_H 1 -/* $Id: dname_39.h,v 1.17.18.2 2005/04/29 00:16:31 marka Exp $ */ +/* $Id: dname_39.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief per RFC2672 */ @@ -1351,10 +1351,10 @@ typedef struct dns_rdata_dname { #endif /* GENERIC_DNAME_39_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1370,7 +1370,7 @@ typedef struct dns_rdata_dname { #ifndef GENERIC_OPT_41_H #define GENERIC_OPT_41_H 1 -/* $Id: opt_41.h,v 1.14.18.2 2005/04/29 00:16:38 marka Exp $ */ +/* $Id: opt_41.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2671 */ @@ -1406,10 +1406,10 @@ dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *); #endif /* GENERIC_OPT_41_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1426,7 +1426,7 @@ dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *); #ifndef IN_1_APL_42_H #define IN_1_APL_42_H 1 -/* $Id: apl_42.h,v 1.2.18.2 2005/04/29 00:16:42 marka 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; @@ -1462,10 +1462,10 @@ dns_rdata_apl_current(dns_rdata_in_apl_t *, dns_rdata_apl_ent_t *); #endif /* IN_1_APL_42_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1478,7 +1478,7 @@ dns_rdata_apl_current(dns_rdata_in_apl_t *, dns_rdata_apl_ent_t *); * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ds_43.h,v 1.3.20.2 2005/04/29 00:16:32 marka 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 @@ -1497,10 +1497,10 @@ typedef struct dns_rdata_ds { #endif /* GENERIC_DS_43_H */ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1513,7 +1513,7 @@ typedef struct dns_rdata_ds { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sshfp_44.h,v 1.2.18.3 2006/03/10 04:04:32 marka Exp $ */ +/* $Id: sshfp_44.h,v 1.8 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC 4255 */ @@ -1532,9 +1532,9 @@ typedef struct dns_rdata_sshfp { #endif /* GENERIC_SSHFP_44_H */ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1547,7 +1547,7 @@ typedef struct dns_rdata_sshfp { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ipseckey_45.h,v 1.2.2.1 2005/07/07 03:17:36 marka 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 @@ -1567,10 +1567,10 @@ typedef struct dns_rdata_ipseckey { #endif /* GENERIC_IPSECKEY_45_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1586,7 +1586,7 @@ typedef struct dns_rdata_ipseckey { #ifndef GENERIC_DNSSIG_46_H #define GENERIC_DNSSIG_46_H 1 -/* $Id: rrsig_46.h,v 1.3.20.2 2005/04/29 00:16:39 marka Exp $ */ +/* $Id: rrsig_46.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per RFC2535 */ @@ -1608,7 +1608,7 @@ typedef struct dns_rdata_rrsig { #endif /* GENERIC_DNSSIG_46_H */ /* - * Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -1627,7 +1627,7 @@ typedef struct dns_rdata_rrsig { #ifndef GENERIC_NSEC_47_H #define GENERIC_NSEC_47_H 1 -/* $Id: nsec_47.h,v 1.4.20.4 2008/07/15 23:46:14 tbox Exp $ */ +/* $Id: nsec_47.h,v 1.10 2008/07/15 23:47:21 tbox Exp $ */ /*! * \brief Per RFC 3845 */ @@ -1642,10 +1642,10 @@ typedef struct dns_rdata_nsec { #endif /* GENERIC_NSEC_47_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1661,7 +1661,7 @@ typedef struct dns_rdata_nsec { #ifndef GENERIC_DNSKEY_48_H #define GENERIC_DNSKEY_48_H 1 -/* $Id: dnskey_48.h,v 1.3.20.2 2005/04/29 00:16:32 marka Exp $ */ +/* $Id: dnskey_48.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief per RFC2535 */ @@ -1679,10 +1679,171 @@ typedef struct dns_rdata_dnskey { #endif /* GENERIC_DNSKEY_48_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2006, 2007 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 IN_1_DHCID_49_H +#define IN_1_DHCID_49_H 1 + +/* $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; + isc_mem_t *mctx; + unsigned char *dhcid; + unsigned int length; +} dns_rdata_in_dhcid_t; + +#endif /* IN_1_DHCID_49_H */ +/* + * Copyright (C) 2008 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_NSEC3_50_H +#define GENERIC_NSEC3_50_H 1 + +/* $Id: nsec3_50.h,v 1.4 2008/09/25 04:02:39 tbox Exp $ */ + +/*! + * \brief Per RFC 5155 */ + +#include <isc/iterated_hash.h> + +typedef struct dns_rdata_nsec3 { + dns_rdatacommon_t common; + isc_mem_t *mctx; + dns_hash_t hash; + unsigned char flags; + dns_iterations_t iterations; + unsigned char salt_length; + unsigned char next_length; + isc_uint16_t len; + unsigned char *salt; + unsigned char *next; + unsigned char *typebits; +} dns_rdata_nsec3_t; + +/* + * The corresponding NSEC3 interval is OPTOUT indicating possible + * insecure delegations. + */ +#define DNS_NSEC3FLAG_OPTOUT 0x01U + +/*% + * Non-standard, NSEC3PARAM only. + * + * Create a corresponding NSEC3 chain. + * Once the NSEC3 chain is complete this flag will be removed to signal + * that there is a complete chain. + * + * 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. + */ +#define DNS_NSEC3FLAG_CREATE 0x80U + +/*% + * Non-standard, NSEC3PARAM only. + * + * The corresponding NSEC3 set is to be removed once the NSEC chain + * has been generated. + * + * 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. + */ +#define DNS_NSEC3FLAG_REMOVE 0x40U + +/*% + * Non-standard, NSEC3PARAM only. + * + * Used to identify NSEC3PARAM records added in this UPDATE request. + */ +#define DNS_NSEC3FLAG_UPDATE 0x20U + +/*% + * Non-standard, NSEC3PARAM 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. + */ +#define DNS_NSEC3FLAG_NONSEC 0x10U + +#endif /* GENERIC_NSEC3_50_H */ +/* + * Copyright (C) 2008 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_NSEC3PARAM_51_H +#define GENERIC_NSEC3PARAM_51_H 1 + +/* $Id: nsec3param_51.h,v 1.4 2008/09/25 04:02:39 tbox Exp $ */ + +/*! + * \brief Per RFC 5155 */ + +#include <isc/iterated_hash.h> + +typedef struct dns_rdata_nsec3param { + dns_rdatacommon_t common; + isc_mem_t *mctx; + dns_hash_t hash; + unsigned char flags; /* DNS_NSEC3FLAG_* */ + dns_iterations_t iterations; + unsigned char salt_length; + unsigned char *salt; +} dns_rdata_nsec3param_t; + +#endif /* GENERIC_NSEC3PARAM_51_H */ +/* + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1698,7 +1859,7 @@ typedef struct dns_rdata_dnskey { #ifndef GENERIC_SPF_99_H #define GENERIC_SPF_99_H 1 -/* $Id: spf_99.h,v 1.1.2.2 2005/07/16 00:40:54 marka 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; @@ -1730,10 +1891,10 @@ dns_rdata_spf_current(dns_rdata_spf_t *, dns_rdata_spf_string_t *); #endif /* GENERIC_SPF_99_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1750,7 +1911,7 @@ dns_rdata_spf_current(dns_rdata_spf_t *, dns_rdata_spf_string_t *); #ifndef GENERIC_UNSPEC_103_H #define GENERIC_UNSPEC_103_H 1 -/* $Id: unspec_103.h,v 1.13.18.2 2005/04/29 00:16:40 marka 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; @@ -1761,10 +1922,10 @@ typedef struct dns_rdata_unspec_t { #endif /* GENERIC_UNSPEC_103_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001, 2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1780,7 +1941,7 @@ typedef struct dns_rdata_unspec_t { #ifndef GENERIC_TKEY_249_H #define GENERIC_TKEY_249_H 1 -/* $Id: tkey_249.h,v 1.20.18.2 2005/04/29 00:16:40 marka Exp $ */ +/* $Id: tkey_249.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */ /*! * \brief Per draft-ietf-dnsind-tkey-00.txt */ @@ -1802,10 +1963,10 @@ typedef struct dns_rdata_tkey { #endif /* GENERIC_TKEY_249_H */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1818,7 +1979,7 @@ typedef struct dns_rdata_tkey { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsig_250.h,v 1.21.18.2 2005/04/29 00:16:29 marka 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 @@ -1840,9 +2001,9 @@ typedef struct dns_rdata_any_tsig { #endif /* ANY_255_TSIG_250_H */ /* - * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1855,7 +2016,7 @@ typedef struct dns_rdata_any_tsig { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dlv_32769.h,v 1.2.2.2 2006/02/19 06:50:47 marka Exp $ */ +/* $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 @@ -1873,10 +2034,10 @@ typedef struct dns_rdata_dlv { #endif /* GENERIC_DLV_32769_H */ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -1889,7 +2050,7 @@ typedef struct dns_rdata_dlv { * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdatastructsuf.h,v 1.8 2004/03/05 05:10:04 marka Exp $ */ +/* $Id: rdatastructsuf.h,v 1.10 2007/06/19 23:47:17 tbox Exp $ */ ISC_LANG_ENDDECLS diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile index 6e76a87..7648da5 100644 --- a/lib/bind/isc/Makefile +++ b/lib/bind/isc/Makefile @@ -27,14 +27,16 @@ SRCS+= condition.c mutex.c \ .PATH: ${SRCDIR} SRCS+= inet_pton.c \ - assertions.c base64.c bitstring.c buffer.c \ - bufferlist.c commandline.c error.c event.c \ - hash.c heap.c hex.c hmacmd5.c hmacsha.c \ - lex.c lfsr.c lib.c log.c md5.c \ - mem.c mutexblock.c netaddr.c netscope.c ondestroy.c \ - parseint.c portset.c print.c quota.c random.c \ + assertions.c base32.c base64.c bitstring.c buffer.c \ + bufferlist.c commandline.c entropy.c error.c event.c \ + fsaccess.c hash.c heap.c hex.c hmacmd5.c hmacsha.c \ + httpd.c inet_aton.c inet_ntop.c iterated_hash.c \ + lex.c lfsr.c lib.c log.c \ + md5.c mem.c mutexblock.c \ + netaddr.c netscope.c ondestroy.c \ + parseint.c portset.c print.c quota.c radix.c random.c \ ratelimiter.c refcount.c region.c result.c rwlock.c \ - serial.c sha1.c sha2.c sockaddr.c string.c strtoul.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 CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include @@ -47,6 +49,7 @@ LDADD= ${PTHREAD_LDADD} .if ${MK_BIND_LIBS} != "no" INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/assertions.h \ + ${SRCDIR}/include/isc/base32.h \ ${SRCDIR}/include/isc/base64.h \ ${SRCDIR}/include/isc/bitstring.h \ ${SRCDIR}/include/isc/boolean.h \ @@ -65,6 +68,8 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/hex.h \ ${SRCDIR}/include/isc/hmacmd5.h \ ${SRCDIR}/include/isc/hmacsha.h \ + ${SRCDIR}/include/isc/httpd.h \ + ${SRCDIR}/include/isc/iterated_hash.h \ ${SRCDIR}/include/isc/interfaceiter.h \ ${SRCDIR}/include/isc/ipv6.h \ ${SRCDIR}/include/isc/lang.h \ @@ -87,6 +92,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/portset.h \ ${SRCDIR}/include/isc/print.h \ ${SRCDIR}/include/isc/quota.h \ + ${SRCDIR}/include/isc/radix.h \ ${SRCDIR}/include/isc/random.h \ ${SRCDIR}/include/isc/ratelimiter.h \ ${SRCDIR}/include/isc/refcount.h \ @@ -100,6 +106,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/sha2.h \ ${SRCDIR}/include/isc/sockaddr.h \ ${SRCDIR}/include/isc/socket.h \ + ${SRCDIR}/include/isc/stats.h \ ${SRCDIR}/include/isc/stdio.h \ ${SRCDIR}/include/isc/stdlib.h \ ${SRCDIR}/include/isc/string.h \ @@ -110,6 +117,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ + ${SRCDIR}/include/isc/xml.h \ ${SRCDIR}/pthreads/include/isc/condition.h \ ${SRCDIR}/pthreads/include/isc/mutex.h \ ${SRCDIR}/pthreads/include/isc/once.h \ diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h index 09e481e..197a2bc 100644 --- a/lib/bind/isc/isc/platform.h +++ b/lib/bind/isc/isc/platform.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 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,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.34.18.11 2008/06/24 23:45:55 tbox Exp $ */ +/* $Id: platform.h.in,v 1.48.84.2 2009/02/16 23:47:15 tbox Exp $ */ #ifndef ISC_PLATFORM_H #define ISC_PLATFORM_H 1 @@ -28,11 +28,6 @@ ***** Platform-dependent defines. *****/ -/* - * Define if the platform has <strings.h>. - */ -#define ISC_PLATFORM_HAVESTRINGSH 1 - /*** *** Network. ***/ @@ -101,29 +96,26 @@ #undef ISC_PLATFORM_NEEDPTON /*! \brief - * If this system needs inet_aton(), ISC_PLATFORM_NEEDATON will be defined. - */ -#undef ISC_PLATFORM_NEEDATON - -/*! \brief * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined. */ #undef ISC_PLATFORM_NEEDPORTT /*! \brief - * If the system needs strsep(), ISC_PLATFORM_NEEDSTRSEP will be defined. + * Define if the system has struct lifconf which is a extended struct ifconf + * for IPv6. */ -#undef ISC_PLATFORM_NEEDSTRSEP +#undef ISC_PLATFORM_HAVELIFCONF /*! \brief - * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined. + * Define if the system has struct if_laddrconf which is a extended struct + * ifconf for IPv6. */ -#undef ISC_PLATFORM_NEEDSTRLCPY +#undef ISC_PLATFORM_HAVEIF_LADDRCONF /*! \brief - * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined. + * Define if the system has struct if_laddrreq. */ -#undef ISC_PLATFORM_NEEDSTRLCAT +#undef ISC_PLATFORM_HAVEIF_LADDRREQ /*! \brief * Define either ISC_PLATFORM_BSD44MSGHDR or ISC_PLATFORM_BSD43MSGHDR. @@ -131,10 +123,9 @@ #define ISC_NET_BSD44MSGHDR 1 /*! \brief - * Define if PTHREAD_ONCE_INIT should be surrounded by braces to - * prevent compiler warnings (such as with gcc on Solaris 2.8). + * Define if the system supports if_nametoindex. */ -#undef ISC_PLATFORM_BRACEPTHREADONCEINIT +#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1 /*! \brief * Define on some UnixWare systems to fix erroneous definitions of various @@ -177,62 +168,74 @@ */ #define ISC_PLATFORM_QUADFORMAT "ll" -/*! \brief - * Defined if we are using threads. +/*** + *** String functions. + ***/ +/* + * If the system needs strsep(), ISC_PLATFORM_NEEDSTRSEP will be defined. */ -#define ISC_PLATFORM_USETHREADS 1 +#undef ISC_PLATFORM_NEEDSTRSEP -/*! \brief - * Defined if unistd.h does not cause fd_set to be delared. +/* + * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined. */ -#undef ISC_PLATFORM_NEEDSYSSELECTH +#undef ISC_PLATFORM_NEEDSTRLCPY -/*! \brief - * Type used for resource limits. +/* + * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined. */ -#define ISC_PLATFORM_RLIMITTYPE rlim_t +#undef ISC_PLATFORM_NEEDSTRLCAT -/*! \brief - * Define if your compiler supports "long long int". +/* + * Define if this system needs strtoul. */ -#define ISC_PLATFORM_HAVELONGLONG 1 +#undef ISC_PLATFORM_NEEDSTRTOUL -/*! \brief - * Define if the system has struct lifconf which is a extended struct ifconf - * for IPv6. +/* + * Define if this system needs memmove. */ -#undef ISC_PLATFORM_HAVELIFCONF +#undef ISC_PLATFORM_NEEDMEMMOVE -/*! \brief - * Define if the system has struct if_laddrconf which is a extended struct - * ifconf for IPv6. +/*** + *** Miscellaneous. + ***/ + +/* + * Defined if we are using threads. */ -#undef ISC_PLATFORM_HAVEIF_LADDRCONF +#define ISC_PLATFORM_USETHREADS 1 -/*! \brief - * Define if the system has struct if_laddrreq. +/* + * Defined if unistd.h does not cause fd_set to be delared. */ -#undef ISC_PLATFORM_HAVEIF_LADDRREQ +#undef ISC_PLATFORM_NEEDSYSSELECTH -/*! \brief - * Used to control how extern data is linked; needed for Win32 platforms. +/* + * Defined to <gssapi.h> or <gssapi/gssapi.h> for how to include + * the GSSAPI header. */ -#undef ISC_PLATFORM_USEDECLSPEC -/*! \brief - * Define if the system supports if_nametoindex. + +/* + * Type used for resource limits. */ -#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1 +#define ISC_PLATFORM_RLIMITTYPE rlim_t -/*! \brief - * Define if this system needs strtoul. +/* + * Define if your compiler supports "long long int". */ -#undef ISC_PLATFORM_NEEDSTRTOUL +#define ISC_PLATFORM_HAVELONGLONG 1 -/*! \brief - * Define if this system needs memmove. +/* + * Define if PTHREAD_ONCE_INIT should be surrounded by braces to + * prevent compiler warnings (such as with gcc on Solaris 2.8). */ -#undef ISC_PLATFORM_NEEDMEMMOVE +#undef ISC_PLATFORM_BRACEPTHREADONCEINIT + +/* + * Used to control how extern data is linked; needed for Win32 platforms. + */ +#undef ISC_PLATFORM_USEDECLSPEC /* * Define if the platform has <sys/un.h>. @@ -246,6 +249,12 @@ #define ISC_PLATFORM_HAVEXADD 1 /* + * If the "xaddq" operation (64bit xadd) is available on this architecture, + * ISC_PLATFORM_HAVEXADDQ will be defined. + */ +#undef ISC_PLATFORM_HAVEXADDQ + +/* * If the "atomic swap" operation is available on this architecture, * ISC_PLATFORM_HAVEATOMICSTORE" will be defined. */ @@ -273,6 +282,15 @@ /* + * Define if the platform has <strings.h>. + */ +#define ISC_PLATFORM_HAVESTRINGSH 1 + +/*** + *** Windows dll support. + ***/ + +/* * Define if MacOS style of PPC assembly must be used. * e.g. "r6", not "6", for register six. */ diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile index 26dfeb1..d4a94d7 100644 --- a/lib/bind/lwres/Makefile +++ b/lib/bind/lwres/Makefile @@ -21,7 +21,8 @@ SRCS+= 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 + lwinetaton.c lwinetpton.c lwinetntop.c print.c \ + strtoul.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include CFLAGS+= -I${.CURDIR} diff --git a/lib/bind/lwres/lwres/netdb.h b/lib/bind/lwres/lwres/netdb.h index 7daa388..cb5cc28 100644 --- a/lib/bind/lwres/lwres/netdb.h +++ b/lib/bind/lwres/lwres/netdb.h @@ -1,10 +1,10 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netdb.h.in,v 1.35.18.2 2005/04/29 00:17:22 marka Exp $ */ +/* $Id: netdb.h.in,v 1.39.332.2 2009/01/18 23:47:41 tbox Exp $ */ /*! \file */ @@ -68,7 +68,7 @@ struct addrinfo { #define NETDB_INTERNAL -1 /* see errno */ #define NETDB_SUCCESS 0 /* no problem */ #define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ +#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */ #define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ #define NO_DATA 4 /* Valid name, no data record of requested type */ #define NO_ADDRESS NO_DATA /* no address, look for MX record */ diff --git a/lib/bind/lwres/lwres/platform.h b/lib/bind/lwres/lwres/platform.h index 87ebb22..608bb72 100644 --- a/lib/bind/lwres/lwres/platform.h +++ b/lib/bind/lwres/lwres/platform.h @@ -1,10 +1,10 @@ /* $FreeBSD$ */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.14.18.5 2005/06/08 02:07:59 marka Exp $ */ +/* $Id: platform.h.in,v 1.21 2007/06/19 23:47:23 tbox Exp $ */ /*! \file */ |
