Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/bind/dist merge import of bind-9.8.0-P4
details: https://anonhg.NetBSD.org/src/rev/e34e33124e75
branches: trunk
changeset: 766984:e34e33124e75
user: spz <spz%NetBSD.org@localhost>
date: Tue Jul 05 21:59:18 2011 +0000
description:
merge import of bind-9.8.0-P4
diffstat:
external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 | 8 +-
external/bsd/bind/dist/bin/named/bind9.xsl.h | 8 +-
external/bsd/bind/dist/bin/named/config.c | 6 +-
external/bsd/bind/dist/bin/named/query.c | 18 +++-
external/bsd/bind/dist/bin/named/update.c | 10 +-
external/bsd/bind/dist/bin/rndc/rndc.c | 6 +-
external/bsd/bind/dist/bin/tests/resolver/t_resolver.c | 22 +++---
external/bsd/bind/dist/lib/dns/dispatch.c | 6 +-
external/bsd/bind/dist/lib/dns/include/dns/masterdump.h | 9 +-
external/bsd/bind/dist/lib/dns/include/dns/rdataset.h | 13 ++-
external/bsd/bind/dist/lib/dns/include/dns/resolver.h | 6 +-
external/bsd/bind/dist/lib/dns/masterdump.c | 59 ++++------------
external/bsd/bind/dist/lib/dns/message.c | 16 ++--
external/bsd/bind/dist/lib/dns/ncache.c | 11 ++-
external/bsd/bind/dist/lib/dns/nsec3.c | 16 ++--
external/bsd/bind/dist/lib/dns/rbtdb.c | 31 +++++---
external/bsd/bind/dist/lib/dns/rdataset.c | 28 ++++++-
external/bsd/bind/dist/lib/dns/rdataslab.c | 8 +-
external/bsd/bind/dist/lib/dns/resolver.c | 17 ++--
external/bsd/bind/dist/lib/dns/validator.c | 12 ++-
external/bsd/bind/dist/lib/dns/xfrin.c | 6 +-
external/bsd/bind/dist/lib/isc/include/isc/task.h | 6 +-
external/bsd/bind/dist/lib/isc/task.c | 6 +-
external/bsd/bind/dist/lib/isc/timer.c | 6 +-
external/bsd/bind/dist/lib/isc/unix/socket.c | 6 +-
external/bsd/bind/dist/lib/isc/win32/include/isc/ipv6.h | 6 +-
26 files changed, 185 insertions(+), 161 deletions(-)
diffs (truncated from 1175 to 300 lines):
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8
--- a/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 Tue Jul 05 21:59:18 2011 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: dnssec-keyfromlabel.8,v 1.2 2011/02/16 03:46:45 christos Exp $
+.\" $NetBSD: dnssec-keyfromlabel.8,v 1.3 2011/07/05 21:59:18 spz Exp $
.\"
-.\" Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" Id: dnssec-keyfromlabel.8,v 1.18.14.1 2011-02-03 12:29:12 tbox Exp
+.\" Id: dnssec-keyfromlabel.8,v 1.18.14.1.2.1 2011-06-09 03:41:05 tbox Exp
.\"
.hy 0
.ad l
@@ -217,5 +217,5 @@
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2008\-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2008\-2011 Internet Systems Consortium, Inc. ("ISC")
.br
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/named/bind9.xsl.h
--- a/external/bsd/bind/dist/bin/named/bind9.xsl.h Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/named/bind9.xsl.h Tue Jul 05 21:59:18 2011 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: bind9.xsl.h,v 1.2 2011/02/16 03:46:46 christos Exp $ */
+/* $NetBSD: bind9.xsl.h,v 1.3 2011/07/05 21:59:18 spz Exp $ */
/*
- * Generated by convertxsl.pl 1.14 2008/07/17 23:43:26 jinmei Exp
- * From bind9.xsl 1.21 2009/01/27 23:47:54 tbox Exp
+ * Generated by convertxsl.pl 1.14 2008-07-17 23:43:26 jinmei Exp
+ * From bind9.xsl 1.21 2009-01-27 23:47:54 tbox Exp
*/
static char xslmsg[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -22,7 +22,7 @@
" - PERFORMANCE OF THIS SOFTWARE.\n"
"-->\n"
"\n"
- "<!-- \045Id: bind9.xsl,v 1.21 2009/01/27 23:47:54 tbox Exp \045 -->\n"
+ "<!-- \045Id: bind9.xsl,v 1.21 2009-01-27 23:47:54 tbox Exp \045 -->\n"
"\n"
"<xsl:stylesheet version=\"1.0\"\n"
" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n";
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/named/config.c
--- a/external/bsd/bind/dist/bin/named/config.c Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/named/config.c Tue Jul 05 21:59:18 2011 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: config.c,v 1.2 2011/02/16 03:46:46 christos Exp $ */
+/* $NetBSD: config.c,v 1.3 2011/07/05 21:59:18 spz Exp $ */
/*
- * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001-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: config.c,v 1.113.16.1 2011-02-03 05:50:05 marka Exp */
+/* Id: config.c,v 1.113.16.1.2.1 2011-06-02 23:47:28 tbox Exp */
/*! \file */
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/named/query.c
--- a/external/bsd/bind/dist/bin/named/query.c Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/named/query.c Tue Jul 05 21:59:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.4 2011/05/29 15:17:09 spz Exp $ */
+/* $NetBSD: query.c,v 1.5 2011/07/05 21:59:18 spz Exp $ */
/*
* Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: query.c,v 1.353.8.2.2.1 2011-04-27 17:06:27 each Exp */
+/* Id: query.c,v 1.353.8.2.2.5 2011-06-09 03:17:10 marka Exp */
/*! \file */
@@ -639,6 +639,7 @@
dns_db_attach(db, &dbversion->db);
dns_db_currentversion(db, &dbversion->version);
dbversion->acl_checked = ISC_FALSE;
+ dbversion->queryok = ISC_FALSE;
ISC_LIST_APPEND(client->query.activeversions,
dbversion, link);
}
@@ -770,6 +771,7 @@
dbversion->queryok = ISC_FALSE;
return (DNS_R_REFUSED);
}
+ dbversion->queryok = ISC_TRUE;
approved:
/* Transfer ownership, if necessary. */
@@ -4093,7 +4095,7 @@
if (qtype == dns_rdatatype_rrsig ||
qtype == dns_rdatatype_sig)
result = DNS_R_NXRRSET;
- else
+ else
result = dns_db_find(*dbp, qnamef, version,
qtype, 0, client->now,
nodep, found, *rdatasetp,
@@ -4113,8 +4115,13 @@
}
break;
case DNS_R_DNAME:
- policy = DNS_RPZ_POLICY_RECORD;
- break;
+ /*
+ * DNAME policy RRs have very few if any uses that are not
+ * better served with simple wildcards. Making the work would
+ * require complications to get the number of labels matched
+ * in the name or the found name itself to the main DNS_R_DNAME
+ * case in query_find(). So fall through to treat them as NODATA.
+ */
case DNS_R_NXRRSET:
policy = DNS_RPZ_POLICY_NODATA;
break;
@@ -5324,6 +5331,7 @@
break;
case DNS_RPZ_POLICY_RECORD:
if (type == dns_rdatatype_any &&
+ result != DNS_R_CNAME &&
dns_rdataset_isassociated(rdataset))
dns_rdataset_disassociate(rdataset);
break;
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/named/update.c
--- a/external/bsd/bind/dist/bin/named/update.c Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/named/update.c Tue Jul 05 21:59:18 2011 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: update.c,v 1.2 2011/02/16 03:46:46 christos Exp $ */
+/* $NetBSD: update.c,v 1.3 2011/07/05 21:59:18 spz Exp $ */
/*
- * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011 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: update.c,v 1.186.16.1 2011-02-03 06:18:51 marka Exp */
+/* Id: update.c,v 1.186.16.1.2.1 2011-06-02 23:47:28 tbox Exp */
#include <config.h>
@@ -3438,7 +3438,7 @@
*/
for (tuple = ISC_LIST_HEAD(diff->tuples);
tuple != NULL; tuple = next) {
-
+
next = ISC_LIST_NEXT(tuple, link);
if (tuple->rdata.type != dns_rdatatype_dnskey)
@@ -3502,7 +3502,7 @@
tuple = ISC_LIST_HEAD(temp_diff.tuples)) {
ISC_LIST_UNLINK(temp_diff.tuples, tuple, link);
- ISC_LIST_APPEND(diff->tuples, tuple, link);
+ ISC_LIST_APPEND(diff->tuples, tuple, link);
dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL);
if ((dnskey.flags &
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/rndc/rndc.c
--- a/external/bsd/bind/dist/bin/rndc/rndc.c Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/rndc/rndc.c Tue Jul 05 21:59:18 2011 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: rndc.c,v 1.2 2011/02/16 03:46:48 christos Exp $ */
+/* $NetBSD: rndc.c,v 1.3 2011/07/05 21:59:18 spz Exp $ */
/*
- * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-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: rndc.c,v 1.131.20.1 2011-02-03 11:44:45 marka Exp */
+/* Id: rndc.c,v 1.131.20.1.2.1 2011-06-02 23:47:28 tbox Exp */
/*! \file */
diff -r 3f24a1911251 -r e34e33124e75 external/bsd/bind/dist/bin/tests/resolver/t_resolver.c
--- a/external/bsd/bind/dist/bin/tests/resolver/t_resolver.c Tue Jul 05 21:22:43 2011 +0000
+++ b/external/bsd/bind/dist/bin/tests/resolver/t_resolver.c Tue Jul 05 21:59:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_resolver.c,v 1.2 2011/02/16 03:46:51 christos Exp $ */
+/* $NetBSD: t_resolver.c,v 1.3 2011/07/05 21:59:18 spz Exp $ */
/*
* Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: t_resolver.c,v 1.2.2.2 2011-02-03 05:50:06 marka Exp */
+/* Id: t_resolver.c,v 1.2.2.2.2.1 2011-06-02 23:47:28 tbox Exp */
#include <config.h>
@@ -54,7 +54,7 @@
{
isc_sockaddr_t local_address;
isc_sockaddr_any(&local_address);
-
+
CHECK(dns_dispatch_getudp(dispatch_manager, socket_manager, task_manager,
&local_address, 4096, 100, 100, 100, 500,
0, 0, /* unsigned int attributes, unsigned int mask, */
@@ -85,7 +85,7 @@
static isc_result_t
make_resolver(dns_resolver_t **resolverp) {
isc_result_t result;
-
+
result = dns_resolver_create(view,
task_manager, 1,
socket_manager,
@@ -130,7 +130,7 @@
"The default timeout is returned from _gettimeout()");
setup();
CHECK(make_resolver(&resolver));
-
+
timeout = dns_resolver_gettimeout(resolver);
t_info("The default timeout is %d second%s\n", timeout, (timeout == 1 ? "" : "s"));
test_result = (timeout > 0) ? T_PASS : T_FAIL;
@@ -151,7 +151,7 @@
"_settimeout() can change the timeout to a non-default");
setup();
CHECK(make_resolver(&resolver));
-
+
default_timeout = dns_resolver_gettimeout(resolver);
t_info("The default timeout is %d second%s\n", default_timeout,
(default_timeout == 1 ? "" : "s"));
@@ -164,7 +164,7 @@
destroy_resolver(&resolver);
teardown();
-
+
t_result(test_result);
}
@@ -179,7 +179,7 @@
" by specifying 0 as the timeout.");
setup();
CHECK(make_resolver(&resolver));
-
+
default_timeout = dns_resolver_gettimeout(resolver);
t_info("The default timeout is %d second%s\n", default_timeout,
(default_timeout == 1 ? "" : "s"));
@@ -195,7 +195,7 @@
destroy_resolver(&resolver);
teardown();
-
+
t_result(test_result);
}
@@ -209,7 +209,7 @@
"_settimeout() cannot set the value larger than the maximum.");
setup();
CHECK(make_resolver(&resolver));
-
+
dns_resolver_settimeout(resolver, 4000000);
timeout = dns_resolver_gettimeout(resolver);
t_info("The new timeout is %d second%s\n", timeout,
@@ -219,7 +219,7 @@
destroy_resolver(&resolver);
teardown();
-
+
t_result(test_result);
Home |
Main Index |
Thread Index |
Old Index