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

[Erwin Lansing]

Author: erwin
Date: Wed Dec  5 13:00:54 2012
New Revision: 243888
URL: http://svnweb.freebsd.org/changeset/base/243888

Log:
  Vendor import of Bind 9.8.4-P1
  
  Approved by:	delphij (mentor)
  Sponsored by:	DK Hostmaster A/S

Modified:
  vendor/bind9/dist/CHANGES
  vendor/bind9/dist/FREEBSD-Xlist
  vendor/bind9/dist/bin/named/query.c
  vendor/bind9/dist/version

Modified: vendor/bind9/dist/CHANGES
==============================================================================
--- vendor/bind9/dist/CHANGES	Wed Dec  5 12:59:17 2012	(r243887)
+++ vendor/bind9/dist/CHANGES	Wed Dec  5 13:00:54 2012	(r243888)
@@ -1,3 +1,8 @@
+	--- 9.8.4-P1 released ---
+
+3407.	[security]	Named could die on specific queries with dns64 enabled.
+			[Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+
 	--- 9.8.4 released ---
 
 3383.	[security]	A certain combination of records in the RBT could

Modified: vendor/bind9/dist/FREEBSD-Xlist
==============================================================================
--- vendor/bind9/dist/FREEBSD-Xlist	Wed Dec  5 12:59:17 2012	(r243887)
+++ vendor/bind9/dist/FREEBSD-Xlist	Wed Dec  5 13:00:54 2012	(r243888)
@@ -11,6 +11,7 @@ docutil
 isc-config.sh.1
 isc-config.sh.docbook
 isc-config.sh.html
+srcid
 util
 
 # Tests

Modified: vendor/bind9/dist/bin/named/query.c
==============================================================================
--- vendor/bind9/dist/bin/named/query.c	Wed Dec  5 12:59:17 2012	(r243887)
+++ vendor/bind9/dist/bin/named/query.c	Wed Dec  5 13:00:54 2012	(r243888)
@@ -5183,10 +5183,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t 
 	isc_result_t result;
 	isc_uint32_t ttl = ISC_UINT32_MAX;
 
+	dns_rdataset_init(&rdataset);
+
 	result = dns_db_getoriginnode(db, &node);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
-	dns_rdataset_init(&rdataset);
+
 	result = dns_db_findrdataset(db, node, version, dns_rdatatype_soa,
 				     0, 0, &rdataset, NULL);
 	if (result != ISC_R_SUCCESS)

Modified: vendor/bind9/dist/version
==============================================================================
--- vendor/bind9/dist/version	Wed Dec  5 12:59:17 2012	(r243887)
+++ vendor/bind9/dist/version	Wed Dec  5 13:00:54 2012	(r243888)
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=8
 PATCHVER=4
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1