aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2010-05-20 05:38:08 +0000
committerDoug Barton <dougb@FreeBSD.org>2010-05-20 05:38:08 +0000
commit18e55afed62288a797a09f3ff59ae2146af6ce0f (patch)
treeee72c3a62a88988fd88b8307e202d8687614355d
parent4308e637cb194c3ff81230993e254a17ea317070 (diff)
downloadsrc-18e55afed62288a797a09f3ff59ae2146af6ce0f.tar.gz
src-18e55afed62288a797a09f3ff59ae2146af6ce0f.zip
Vendor import of BIND 9.6.2-P2vendor/bind9/9.6.2-P2
Notes
Notes: svn path=/vendor/bind9/dist/; revision=208328 svn path=/vendor/bind9/9.6.2-P2/; revision=208329; tag=vendor/bind9/9.6.2-P2
-rw-r--r--CHANGES5
-rw-r--r--lib/dns/api2
-rw-r--r--lib/dns/validator.c4
-rw-r--r--version4
4 files changed, 10 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index d14fdd638f91..3f2df7971772 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+ --- 9.6.2-P2 released ---
+
+2876. [bug] Named could return SERVFAIL for negative responses
+ from unsigned zones. [RT #21131]
+
--- 9.6.2-P1 released ---
2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619]
diff --git a/lib/dns/api b/lib/dns/api
index 4fc7eca838cb..e9df7dbcd801 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -1,3 +1,3 @@
LIBINTERFACE = 56
-LIBREVISION = 0
+LIBREVISION = 1
LIBAGE = 1
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 0ccdc41980ce..7144ae2ab6d8 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: validator.c,v 1.164.12.11.8.2 2010/02/25 10:57:12 tbox Exp $ */
+/* $Id: validator.c,v 1.164.12.11.8.3 2010/04/21 04:29:01 marka Exp $ */
#include <config.h>
@@ -2961,7 +2961,7 @@ nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
}
findnsec3proofs(val);
- if (val->authcount == val->authfail)
+ if (val->authfail != 0 && val->authcount == val->authfail)
return (DNS_R_BROKENCHAIN);
validator_log(val, ISC_LOG_DEBUG(3),
"nonexistence proof(s) not found");
diff --git a/version b/version
index 79bbd493946c..d9367f8c1918 100644
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.43.12.8.2.3 2010/03/04 00:08:28 marka Exp $
+# $Id: version,v 1.43.12.8.2.4 2010/05/10 02:07:03 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=6
PATCHVER=2
RELEASETYPE=-P
-RELEASEVER=1
+RELEASEVER=2