aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2009-07-28 22:58:40 +0000
committerDoug Barton <dougb@FreeBSD.org>2009-07-28 22:58:40 +0000
commitd5e9ae7e174c2efbbf724c173aa324efe94b7ccc (patch)
tree863e30fb95eb818d938fa2fa5c35722bd8f2bded
parent53ae1d202dc8ab10c2a95d64232a5ce37efdec73 (diff)
downloadsrc-d5e9ae7e174c2efbbf724c173aa324efe94b7ccc.tar.gz
src-d5e9ae7e174c2efbbf724c173aa324efe94b7ccc.zip
Vendor import of BIND 9.6.1-P1vendor/bind9/9.6.1-P1
Notes
Notes: svn path=/vendor/bind9/dist/; revision=195928 svn path=/vendor/bind9/9.6.1-P1/; revision=195929; tag=vendor/bind9/9.6.1-P1
-rw-r--r--CHANGES4
-rw-r--r--bin/named/update.c8
-rw-r--r--version6
3 files changed, 13 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 2fc7dff36876..1f2c35a14113 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ --- 9.6.1-P1 released ---
+
+2640. [security] A specially crafted update packet will cause named
+ to exit. [RT #20000]
--- 9.6.1 released ---
diff --git a/bin/named/update.c b/bin/named/update.c
index ff07311617c5..b0a556d5cc41 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: update.c,v 1.151.12.5 2009/04/30 07:03:37 marka Exp $ */
+/* $Id: update.c,v 1.151.12.5.12.1 2009/07/28 14:18:08 marka Exp $ */
#include <config.h>
@@ -979,7 +979,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db,
if (type == dns_rdatatype_rrsig ||
type == dns_rdatatype_sig)
covers = dns_rdata_covers(&t->rdata);
- else
+ else if (type == dns_rdatatype_any) {
+ dns_db_detachnode(db, &node);
+ dns_diff_clear(&trash);
+ return (DNS_R_NXRRSET);
+ } else
covers = 0;
/*
diff --git a/version b/version
index 1b3080fc6f78..3245f02d3fd8 100644
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.43.12.5 2009/06/04 04:02:41 marka Exp $
+# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=6
PATCHVER=1
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1