svn commit: r195928 - in vendor/bind9/dist: . bin/named

[Doug Barton]

Author: dougb
Date: Tue Jul 28 22:58:40 2009
New Revision: 195928
URL: http://svn.freebsd.org/changeset/base/195928

Log:
  Vendor import of BIND 9.6.1-P1

Modified:
  vendor/bind9/dist/CHANGES
  vendor/bind9/dist/bin/named/update.c
  vendor/bind9/dist/version

Modified: vendor/bind9/dist/CHANGES
==============================================================================
--- vendor/bind9/dist/CHANGES	Tue Jul 28 22:17:34 2009	(r195927)
+++ vendor/bind9/dist/CHANGES	Tue Jul 28 22:58:40 2009	(r195928)
@@ -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 ---
 

Modified: vendor/bind9/dist/bin/named/update.c
==============================================================================
--- vendor/bind9/dist/bin/named/update.c	Tue Jul 28 22:17:34 2009	(r195927)
+++ vendor/bind9/dist/bin/named/update.c	Tue Jul 28 22:58:40 2009	(r195928)
@@ -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 *
 			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;
 
 			/*

Modified: vendor/bind9/dist/version
==============================================================================
--- vendor/bind9/dist/version	Tue Jul 28 22:17:34 2009	(r195927)
+++ vendor/bind9/dist/version	Tue Jul 28 22:58:40 2009	(r195928)
@@ -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