Changes to generated files related to the 9.3.3 import.

9 files changed, 360 insertions, 93 deletions

diff --git a/lib/bind/bind/config.h b/lib/bind/bind/config.h
index 5177431..bf50257 100644
--- a/lib/bind/bind/config.h
+++ b/lib/bind/bind/config.h
@@ -1,46 +1,98 @@
 /* $FreeBSD$ */
 
 /* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+/*
+ * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: acconfig.h,v 1.35.2.4.2.10 2004/12/04 06:50:02 marka Exp $ */
+
+/***
+ *** This file is not to be included by any public header files, because
+ *** 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 */
-#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
-/* #undef SYS_CDEFS_H */
+
+/* define if your system needs pthread_init() before using pthreads */
+/* #undef NEED_PTHREAD_INIT */
+
+/* define if your system has sigwait() */
+/* #undef HAVE_SIGWAIT */
+
+/* define if sigwait() is the UnixWare flavor */
+/* #undef HAVE_UNIXWARE_SIGWAIT */
+
+/* define on Solaris to get sigwait() to work using pthreads semantics */
 /* #undef _POSIX_PTHREAD_SEMANTICS */
-/* #undef POSIX_GETPWUID_R */
-/* #undef POSIX_GETPWNAM_R */
-/* #undef POSIX_GETGRGID_R */
-/* #undef POSIX_GETGRNAM_R */
 
-/* #undef NEED_SETGROUPENT */
-/* #undef NEED_GETGROUPLIST */
+/* define if LinuxThreads is in use */
+/* #undef HAVE_LINUXTHREADS */
 
-/* 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 if sysconf() is available */
+/* #undef HAVE_SYSCONF */
 
-#define NEED_INNETGR_R 1
-/* #undef NEED_SETNETGRENT_R */
-#define NEED_ENDNETGRENT_R 1
+/* define if sysctlbyname() is available */
+#define HAVE_SYSCTLBYNAME 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
+/* define if catgets() is available */
+#define HAVE_CATGETS 1
 
-/* #undef NEED_SETPASSENT */
+/* define if getifaddrs() exists */
+#define HAVE_GETIFADDRS 1
 
-#define HAS_PW_CLASS 1
+/* define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */
+#define HAVE_IFLIST_SYSCTL 1
 
-/* #undef uintptr_t */
+/* define if chroot() is available */
+#define HAVE_CHROOT 1
+
+/* define if tzset() is available */
+#define HAVE_TZSET 1
+
+/* define if struct addrinfo exists */
+#define HAVE_ADDRINFO 1
+
+/* define if getaddrinfo() exists */
+#define HAVE_GETADDRINFO 1
+
+/* define if gai_strerror() exists */
+#define HAVE_GAISTRERROR 1
+
+/* define if arc4random() exists */
+#define HAVE_ARC4RANDOM 1
+
+/* define if pthread_setconcurrency() should be called to tell the
+ * OS how many threads we might want to run.
+ */
+/* #undef CALL_PTHREAD_SETCONCURRENCY */
+
+/* define if IPv6 is not disabled */
+/* #undef WANT_IPV6 */
+
+/* define if flockfile() is available */
+#define HAVE_FLOCKFILE 1
+
+/* define if getc_unlocked() is available */
+#define HAVE_GETCUNLOCKED 1
 
 /* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */
 /* #undef SHUTUP_SPUTAUX */
@@ -48,13 +100,199 @@
 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
+
+/* Shut up warnings about missing sigwait prototype on BSD/OS 4.0* */
+/* #undef SHUTUP_SIGWAIT */
+#ifdef SHUTUP_SIGWAIT
+int sigwait(const unsigned int *set, int *sig);
+#endif
+
+/* Shut up warnings from gcc -Wcast-qual on BSD/OS 4.1. */
+/* #undef SHUTUP_STDARG_CAST */
+#if defined(SHUTUP_STDARG_CAST) && defined(__GNUC__)
+#include <stdarg.h>		/* Grr.  Must be included *every time*. */
+/*
+ * The silly continuation line is to keep configure from
+ * commenting out the #undef.
+ */
+#undef \
+	va_start
+#define	va_start(ap, last) \
+	do { \
+		union { const void *konst; long *var; } _u; \
+		_u.konst = &(last); \
+		ap = (va_list)(_u.var + __va_words(__typeof(last))); \
+	} while (0)
+#endif /* SHUTUP_STDARG_CAST && __GNUC__ */
+
+/* define if the system has a random number generating device */
+#define PATH_RANDOMDEV "/dev/random"
+
+/* define if pthread_attr_getstacksize() is available */
+/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */
+
+/* define if pthread_attr_setstacksize() is available */
+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+
+/* define if you have strerror in the C library. */
+#define HAVE_STRERROR 1
+
+/* Define if you are running under Compaq TruCluster. */
+/* #undef HAVE_TRUCLUSTER */
+
+/* Define if OpenSSL includes DSA support */
+#define HAVE_OPENSSL_DSA 1
+
+/* Define to the length type used by the socket API (socklen_t, size_t, int). */
+#define ISC_SOCKADDR_LEN_T socklen_t
+
+/* Define if threads need PTHREAD_SCOPE_SYSTEM */
+/* #undef NEED_PTHREAD_SCOPE_SYSTEM */
+
+/* Define if recvmsg() does not meet all of the BSD socket API specifications.
+   */
+/* #undef BROKEN_RECVMSG */
+
+/* Define if you cannot bind() before connect() for TCP sockets. */
+/* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */
+
+/* Define if libcrypto has DH_generate_parameters */
+#define HAVE_DH_GENERATE_PARAMETERS 1
+
+/* Define if libcrypto has DSA_generate_parameters */
+#define HAVE_DSA_GENERATE_PARAMETERS 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* 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 `c_r' library (-lc_r). */
+/* #undef HAVE_LIBC_R */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+/* #undef HAVE_LIBPTHREAD */
+
+/* Define to 1 if you have the `scf' library (-lscf). */
+/* #undef HAVE_LIBSCF */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the `thr' library (-lthr). */
+/* #undef HAVE_LIBTHR */
+
+/* Define to 1 if you have the <linux/capability.h> header file. */
+/* #undef HAVE_LINUX_CAPABILITY_H */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <net/if6.h> header file. */
+/* #undef HAVE_NET_IF6_H */
+
+/* Define if libcrypto has RSA_generate_key */
+#define HAVE_RSA_GENERATE_KEY 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+/* #undef HAVE_SYS_PRCTL_H */
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#define HAVE_SYS_SOCKIO_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if running under Compaq TruCluster */
+/* #undef HAVE_TRUCLUSTER */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Defined if extern char *optarg is not declared. */
+/* #undef NEED_OPTARG */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Sets which flag to pass to open/fcntl to make non-blocking
+   (O_NDELAY/O_NONBLOCK). */
+#define PORT_NONBLOCK O_NONBLOCK
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Defined if you need to use ioctl(FIONBIO) instead a fcntl call to make
+   non-blocking. */
+/* #undef USE_FIONBIO_IOCTL */
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
 #endif
 
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+/* Define to `unsigned long' if <sys/types.h> does not define. */
+/* #undef uintptr_t */
diff --git a/lib/bind/bind/port_after.h b/lib/bind/bind/port_after.h
index 93b8e75..38335d6 100644
--- a/lib/bind/bind/port_after.h
+++ b/lib/bind/bind/port_after.h
@@ -7,12 +7,16 @@
 #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 */
 
 #undef NEED_PSELECT
 #define HAVE_SA_LEN 1
diff --git a/lib/bind/bind/port_before.h b/lib/bind/bind/port_before.h
index 712de93..f18021a 100644
--- a/lib/bind/bind/port_before.h
+++ b/lib/bind/bind/port_before.h
@@ -26,21 +26,21 @@ struct timezone;        /* silence warning */
 
 #undef DO_PTHREADS
 #define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, int *ngroups
-#define GETNETBYADDR_ADDR_T long
+#define GETNETBYADDR_ADDR_T unsigned long int
 #define SETPWENT_VOID 1
 #undef SETGRENT_VOID
 
-#define NET_R_ARGS char *buf, int buflen
-#define NET_R_BAD NULL
+#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 NET_R_ARGS
+#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 nptr
-#define NET_R_RETURN struct netent *
+#define NET_R_OK 0
+#define NET_R_RETURN int
 #undef NET_R_SET_RESULT /*empty*/
-#undef NET_R_SETANSWER
+#define NET_R_SETANSWER 1
 #define NET_R_SET_RETURN void
 #undef NETENT_DATA
 
@@ -54,17 +54,17 @@ struct timezone;        /* silence warning */
 
 
 
-#define HOST_R_ARGS char *buf, int buflen, int *h_errnop
-#define HOST_R_BAD NULL
+#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 hptr
-#define HOST_R_RETURN struct hostent *
-#undef HOST_R_SETANSWER
+#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
@@ -82,18 +82,20 @@ struct timezone;        /* silence warning */
 #define NGR_R_SET_RETURN void
 
 
-#define PROTO_R_ARGS char *buf, int buflen
-#define PROTO_R_BAD NULL
+#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 PROTO_R_ARGS
+#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*/
-#define PROTO_R_OK pptr
-#undef PROTO_R_SETANSWER
-#define PROTO_R_RETURN struct protoent *
+#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
 
 
 
@@ -107,20 +109,22 @@ struct timezone;        /* silence warning */
 #undef PASS_R_SET_RESULT /*empty*/
 #define PASS_R_SET_RETURN void
 
-#define SERV_R_ARGS char *buf, int buflen
-#define SERV_R_BAD NULL
+#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 SERV_R_ARGS
+#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*/
-#define SERV_R_OK sptr
-#undef SERV_R_SETANSWER
-#define SERV_R_RETURN struct servent *
+#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; \
diff --git a/lib/bind/config.h b/lib/bind/config.h
index df9f40e..bf50257 100644
--- a/lib/bind/config.h
+++ b/lib/bind/config.h
@@ -149,6 +149,19 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define if threads need PTHREAD_SCOPE_SYSTEM */
 /* #undef NEED_PTHREAD_SCOPE_SYSTEM */
 
+/* Define if recvmsg() does not meet all of the BSD socket API specifications.
+   */
+/* #undef BROKEN_RECVMSG */
+
+/* Define if you cannot bind() before connect() for TCP sockets. */
+/* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */
+
+/* Define if libcrypto has DH_generate_parameters */
+#define HAVE_DH_GENERATE_PARAMETERS 1
+
+/* Define if libcrypto has DSA_generate_parameters */
+#define HAVE_DSA_GENERATE_PARAMETERS 1
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
@@ -173,6 +186,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the `socket' library (-lsocket). */
 /* #undef HAVE_LIBSOCKET */
 
+/* Define to 1 if you have the `thr' library (-lthr). */
+/* #undef HAVE_LIBTHR */
+
 /* Define to 1 if you have the <linux/capability.h> header file. */
 /* #undef HAVE_LINUX_CAPABILITY_H */
 
@@ -182,6 +198,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the <net/if6.h> header file. */
 /* #undef HAVE_NET_IF6_H */
 
+/* Define if libcrypto has RSA_generate_key */
+#define HAVE_RSA_GENERATE_KEY 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -263,9 +282,11 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h
index 7cf495e..8bb81bb 100644
--- a/lib/bind/dns/code.h
+++ b/lib/bind/dns/code.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -79,7 +79,7 @@
 #include "rdata/generic/unspec_103.c"
 #include "rdata/generic/tkey_249.c"
 #include "rdata/any_255/tsig_250.c"
-#include "rdata/generic/dlv_65323.c"
+#include "rdata/generic/dlv_32769.c"
 
 
 
@@ -180,7 +180,7 @@
 		default: result = DNS_R_UNKNOWN; break; \
 		} \
 		break; \
-	case 65323: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 32769: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	default: result = DNS_R_UNKNOWN; break; \
 	}
 
@@ -281,7 +281,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = totext_dlv(rdata, tctx, target); break; \
+	case 32769: result = totext_dlv(rdata, tctx, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -382,7 +382,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
+	case 32769: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -483,7 +483,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = towire_dlv(rdata, cctx, target); break; \
+	case 32769: result = towire_dlv(rdata, cctx, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -584,7 +584,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = compare_dlv(rdata1, rdata2); break; \
+	case 32769: result = compare_dlv(rdata1, rdata2); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -685,7 +685,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = fromstruct_dlv(rdclass, type, source, target); break; \
+	case 32769: result = fromstruct_dlv(rdclass, type, source, target); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -786,7 +786,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = tostruct_dlv(rdata, target, mctx); break; \
+	case 32769: result = tostruct_dlv(rdata, target, mctx); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -887,7 +887,7 @@
 		default: break; \
 		} \
 		break; \
-	case 65323: freestruct_dlv(source); break; \
+	case 32769: freestruct_dlv(source); break; \
 	default: break; \
 	}
 
@@ -988,7 +988,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = additionaldata_dlv(rdata, add, arg); break; \
+	case 32769: result = additionaldata_dlv(rdata, add, arg); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -1089,7 +1089,7 @@
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = digest_dlv(rdata, digest, arg); break; \
+	case 32769: result = digest_dlv(rdata, digest, arg); break; \
 	default: use_default = ISC_TRUE; break; \
 	}
 
@@ -1190,7 +1190,7 @@
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = checkowner_dlv(name, rdclass, type, wildcard); break; \
+	case 32769: result = checkowner_dlv(name, rdclass, type, wildcard); break; \
 	default: result = ISC_TRUE; break; \
 	}
 
@@ -1291,7 +1291,7 @@
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
-	case 65323: result = checknames_dlv(rdata, owner, bad); break; \
+	case 32769: result = checknames_dlv(rdata, owner, bad); break; \
 	default: result = ISC_TRUE; break; \
 	}
 #define RDATATYPE_COMPARE(_s, _d, _tn, _n, _tp) \
@@ -1380,7 +1380,7 @@
 			break; \
 		case 122: \
 			RDATATYPE_COMPARE("sig", 24, _typename, _length, _typep); \
-			RDATATYPE_COMPARE("dlv", 65323, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("dlv", 32769, _typename, _length, _typep); \
 			break; \
 		case 254: \
 			RDATATYPE_COMPARE("key", 25, _typename, _length, _typep); \
@@ -1531,7 +1531,7 @@
 	case 253: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
 	case 254: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
 	case 255: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
-	case 65323: return (RRTYPE_DLV_ATTRIBUTES); \
+	case 32769: return (RRTYPE_DLV_ATTRIBUTES); \
 	}
 #define RDATATYPE_TOTEXT_SW \
 	switch (type) { \
@@ -1593,6 +1593,6 @@
 	case 253: return (str_totext("MAILB", target)); \
 	case 254: return (str_totext("MAILA", target)); \
 	case 255: return (str_totext("ANY", target)); \
-	case 65323: return (str_totext("DLV", target)); \
+	case 32769: return (str_totext("DLV", target)); \
 	}
 #endif /* DNS_CODE_H */
diff --git a/lib/bind/dns/dns/enumclass.h b/lib/bind/dns/dns/enumclass.h
index f3490a4..1ce2513 100644
--- a/lib/bind/dns/dns/enumclass.h
+++ b/lib/bind/dns/dns/enumclass.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 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 8692368..ae082d7 100644
--- a/lib/bind/dns/dns/enumtype.h
+++ b/lib/bind/dns/dns/enumtype.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -75,7 +75,7 @@ enum {
 	dns_rdatatype_unspec = 103,
 	dns_rdatatype_tkey = 249,
 	dns_rdatatype_tsig = 250,
-	dns_rdatatype_dlv = 65323,
+	dns_rdatatype_dlv = 32769,
 	dns_rdatatype_ixfr = 251,
 	dns_rdatatype_axfr = 252,
 	dns_rdatatype_mailb = 253,
diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h
index ce30e49..96c9f66 100644
--- a/lib/bind/dns/dns/rdatastruct.h
+++ b/lib/bind/dns/dns/rdatastruct.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1677,7 +1677,7 @@ typedef struct dns_rdata_any_tsig {
 
 #endif /* ANY_255_TSIG_250_H */
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1692,11 +1692,11 @@ typedef struct dns_rdata_any_tsig {
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_65323.h,v 1.2.2.3 2004/03/15 01:02:55 marka Exp $ */
+/* $Id: dlv_32769.h,v 1.2.4.2 2006/02/19 06:50:46 marka Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
-#ifndef GENERIC_DLV_65323_H
-#define GENERIC_DLV_65323_H 1
+#ifndef GENERIC_DLV_32769_H
+#define GENERIC_DLV_32769_H 1
 
 typedef struct dns_rdata_dlv {
 	dns_rdatacommon_t	common;
@@ -1708,7 +1708,7 @@ typedef struct dns_rdata_dlv {
 	unsigned char		*digest;
 } dns_rdata_dlv_t;
 
-#endif /* GENERIC_DLV_65323_H */
+#endif /* GENERIC_DLV_32769_H */
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
diff --git a/lib/bind/lwres/lwres/platform.h b/lib/bind/lwres/lwres/platform.h
index ed87c89..556d0d5 100644
--- a/lib/bind/lwres/lwres/platform.h
+++ b/lib/bind/lwres/lwres/platform.h
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.12.2.1.10.2 2004/08/28 06:25:26 marka Exp $ */
+/* $Id: platform.h.in,v 1.12.2.1.10.5 2005/06/08 02:08:32 marka Exp $ */
 
 #ifndef LWRES_PLATFORM_H
 #define LWRES_PLATFORM_H 1
@@ -98,7 +98,7 @@
 /*! \brief
  * Define if this system needs strtoul.
  */
-#undef ISC_PLATFORM_NEEDSTRTOUL
+#undef LWRES_PLATFORM_NEEDSTRTOUL
 
 #ifndef LWRES_PLATFORM_USEDECLSPEC
 #define LIBLWRES_EXTERNAL_DATA