From 2ab28f7b2d53dd7dfc5dc4670481b2d0cd64b358 Mon Sep 17 00:00:00 2001 From: Victor Balada Diaz Date: Thu, 15 Feb 2007 20:28:50 +0000 Subject: [PATCH] Import bind-9.3.4 --- lib/libbind/Makefile | 10 ++---- lib/libbind/dns_ho.c.patch | 40 ------------------------ usr.sbin/named/Makefile.inc | 4 +-- usr.sbin/named/code.h | 36 ++++++++++----------- usr.sbin/named/config.h | 18 ++++++++++- usr.sbin/named/include/dns/enumtype.h | 6 ++-- usr.sbin/named/include/dns/rdatastruct.h | 8 ++--- usr.sbin/named/include/lwres/platform.h | 4 +-- 8 files changed, 48 insertions(+), 78 deletions(-) delete mode 100644 lib/libbind/dns_ho.c.patch diff --git a/lib/libbind/Makefile b/lib/libbind/Makefile index 46203721e2..02978893d3 100644 --- a/lib/libbind/Makefile +++ b/lib/libbind/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libbind/Makefile,v 1.5.2.2 2002/07/19 18:46:25 ru Exp $ -# $DragonFly: src/lib/libbind/Makefile,v 1.9 2006/09/20 21:48:39 victor Exp $ +# $DragonFly: src/lib/libbind/Makefile,v 1.10 2007/02/15 20:28:49 victor Exp $ BIND_DIR=${.CURDIR}/../../contrib/bind-9.3 @@ -30,16 +30,10 @@ SRCS+= dns.c dns_gr.c dns_ho.c dns_nw.c dns_pr.c dns_pw.c \ getpwent_r.c getservent.c getservent_r.c hesiod.c \ irp.c irp_gr.c irp_ho.c irp_ng.c irp_nw.c irp_pr.c \ irp_pw.c irp_sv.c irpmarshall.c irs_data.c lcl.c \ - lcl_gr.c lcl_ho.c lcl_ng.c lcl_nw.c lcl_pr.c\ + lcl_gr.c lcl_ho.c lcl_ng.c lcl_nw.c lcl_pr.c \ lcl_pw.c lcl_sv.c nis.c nis_gr.c nis_ho.c nis_ng.c \ nis_nw.c nis_pr.c nis_pw.c nis_sv.c nul_ng.c util.c -# kind of a messy way to patch this file -# -CONTRIBDIR= ${BIND_DIR}/lib/bind/irs -CFLAGS+=-I${CONTRIBDIR} -SRCS+= dns_ho.c.patch - .PATH: ${BIND_DIR}/lib/bind/nameser SRCS+= ns_date.c ns_name.c ns_netint.c \ ns_parse.c ns_print.c ns_samedomain.c \ diff --git a/lib/libbind/dns_ho.c.patch b/lib/libbind/dns_ho.c.patch deleted file mode 100644 index 5fccfd148e..0000000000 --- a/lib/libbind/dns_ho.c.patch +++ /dev/null @@ -1,40 +0,0 @@ -$DragonFly: src/lib/libbind/Attic/dns_ho.c.patch,v 1.2 2006/09/20 21:48:39 victor Exp $ - -Index: contrib/bind-9.3/lib/bind/irs/dns_ho.c -=================================================================== -RCS file: /cvs/src/contrib/bind-9.3/lib/bind/irs/dns_ho.c,v -retrieving revision 1.1 -diff -u -r1.1 dns_ho.c ---- dns_ho.c.orig 20 Sep 2004 06:33:16 -0000 1.1 -+++ dns_ho.c 17 Jan 2006 23:20:46 -0000 -@@ -260,7 +260,7 @@ - errno = ENOMEM; - goto cleanup; - } -- memset(q, 0, sizeof(q)); -+ memset(q, 0, sizeof(*q)); - - switch (af) { - case AF_INET: -@@ -352,8 +352,8 @@ - errno = ENOMEM; - goto cleanup; - } -- memset(q, 0, sizeof(q)); -- memset(q2, 0, sizeof(q2)); -+ memset(q, 0, sizeof(*q)); -+ memset(q2, 0, sizeof(*q2)); - - if (af == AF_INET6 && len == IN6ADDRSZ && - (!memcmp(uaddr, mapped, sizeof mapped) || -@@ -578,8 +578,8 @@ - errno = ENOMEM; - goto cleanup; - } -- memset(q, 0, sizeof(q2)); -- memset(q2, 0, sizeof(q2)); -+ memset(q, 0, sizeof(*q)); -+ memset(q2, 0, sizeof(*q2)); - - switch (pai->ai_family) { - case AF_UNSPEC: diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc index b395f1b9aa..af61f3e792 100644 --- a/usr.sbin/named/Makefile.inc +++ b/usr.sbin/named/Makefile.inc @@ -1,13 +1,13 @@ # From: Id: Makefile.inc,v 8.4 1996/03/03 17:42:43 vixie Exp # $FreeBSD: src/usr.sbin/named/Makefile.inc,v 1.12.2.3 2001/07/22 18:57:06 dillon Exp $ -# $DragonFly: src/usr.sbin/named/Makefile.inc,v 1.8 2006/09/20 21:48:39 victor Exp $ +# $DragonFly: src/usr.sbin/named/Makefile.inc,v 1.9 2007/02/15 20:28:49 victor Exp $ .ifndef (Mk.Inc) Mk.Inc?=defined BIND_DIR?= ${.CURDIR}/../../contrib/bind-9.3 -VER= 9.3.2-P1 +VER= 9.3.4 PS= ps PIDDIR= /var/run diff --git a/usr.sbin/named/code.h b/usr.sbin/named/code.h index 4fbca8f803..c10b6f1c39 100644 --- a/usr.sbin/named/code.h +++ b/usr.sbin/named/code.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -14,7 +14,7 @@ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $DragonFly: src/usr.sbin/named/code.h,v 1.2 2006/09/20 21:48:39 victor Exp $ */ +/* $DragonFly: src/usr.sbin/named/code.h,v 1.3 2007/02/15 20:28:49 victor Exp $ */ /*************** *************** @@ -78,7 +78,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" @@ -179,7 +179,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; \ } @@ -280,7 +280,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; \ } @@ -381,7 +381,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; \ } @@ -482,7 +482,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; \ } @@ -583,7 +583,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; \ } @@ -684,7 +684,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; \ } @@ -785,7 +785,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; \ } @@ -886,7 +886,7 @@ default: break; \ } \ break; \ - case 65323: freestruct_dlv(source); break; \ + case 32769: freestruct_dlv(source); break; \ default: break; \ } @@ -987,7 +987,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; \ } @@ -1088,7 +1088,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; \ } @@ -1189,7 +1189,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; \ } @@ -1290,7 +1290,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) \ @@ -1379,7 +1379,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); \ @@ -1530,7 +1530,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) { \ @@ -1592,6 +1592,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/usr.sbin/named/config.h b/usr.sbin/named/config.h index 89c66c159a..8132fc32bd 100644 --- a/usr.sbin/named/config.h +++ b/usr.sbin/named/config.h @@ -18,7 +18,7 @@ */ /* $Id: config.h.in,v 1.47.2.3.2.20 2005/10/20 23:57:38 marka Exp $ */ -/* $DragonFly: src/usr.sbin/named/config.h,v 1.2 2006/09/20 21:48:39 victor Exp $ */ +/* $DragonFly: src/usr.sbin/named/config.h,v 1.3 2007/02/15 20:28:49 victor Exp $ */ /*** *** This file is not to be included by any public header files, because @@ -148,9 +148,22 @@ 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 to 1 if you have the header file. */ /* #undef HAVE_DLFCN_H */ +/* Define if libcrypto has DSA_generate_parameters */ +#define HAVE_DSA_GENERATE_PARAMETERS 1 + /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -184,6 +197,9 @@ int sigwait(const unsigned int *set, int *sig); /* Define to 1 if you have the 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 header file. */ #define HAVE_STDINT_H 1 diff --git a/usr.sbin/named/include/dns/enumtype.h b/usr.sbin/named/include/dns/enumtype.h index 58c2f8749d..bb9e5e85d5 100644 --- a/usr.sbin/named/include/dns/enumtype.h +++ b/usr.sbin/named/include/dns/enumtype.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -14,7 +14,7 @@ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $DragonFly: src/usr.sbin/named/include/dns/enumtype.h,v 1.2 2006/09/20 21:48:39 victor Exp $ */ +/* $DragonFly: src/usr.sbin/named/include/dns/enumtype.h,v 1.3 2007/02/15 20:28:50 victor Exp $ */ /*************** *************** @@ -74,7 +74,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/usr.sbin/named/include/dns/rdatastruct.h b/usr.sbin/named/include/dns/rdatastruct.h index 5b5d84bc0f..5711e646d8 100644 --- a/usr.sbin/named/include/dns/rdatastruct.h +++ b/usr.sbin/named/include/dns/rdatastruct.h @@ -40,7 +40,7 @@ */ /* $Id: rdatastructpre.h,v 1.13.206.1 2004/03/06 08:14:02 marka Exp $ */ -/* $DragonFly: src/usr.sbin/named/include/dns/rdatastruct.h,v 1.2 2006/09/20 21:48:39 victor Exp $ */ +/* $DragonFly: src/usr.sbin/named/include/dns/rdatastruct.h,v 1.3 2007/02/15 20:28:50 victor Exp $ */ #ifndef DNS_RDATASTRUCT_H #define DNS_RDATASTRUCT_H 1 @@ -1694,8 +1694,8 @@ typedef struct dns_rdata_any_tsig { /* $Id: dlv_65323.h,v 1.2.2.3 2004/03/15 01:02:55 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; @@ -1707,7 +1707,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/usr.sbin/named/include/lwres/platform.h b/usr.sbin/named/include/lwres/platform.h index 7715f63ba1..02032981de 100644 --- a/usr.sbin/named/include/lwres/platform.h +++ b/usr.sbin/named/include/lwres/platform.h @@ -16,7 +16,7 @@ */ /* $Id: platform.h.in,v 1.12.2.1.10.5 2005/06/08 02:08:32 marka Exp $ */ -/* $DragonFly: src/usr.sbin/named/include/lwres/platform.h,v 1.2 2006/09/20 21:48:39 victor Exp $ */ +/* $DragonFly: src/usr.sbin/named/include/lwres/platform.h,v 1.3 2007/02/15 20:28:50 victor Exp $ */ #ifndef LWRES_PLATFORM_H #define LWRES_PLATFORM_H 1 @@ -97,7 +97,7 @@ /*! \brief * Define if this system needs strtoul. */ -#undef ISC_PLATFORM_NEEDSTRTOUL +#undef LWRES_PLATFORM_NEEDSTRTOUL #ifndef LWRES_PLATFORM_USEDECLSPEC #define LIBLWRES_EXTERNAL_DATA -- 2.41.0