aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwin Lansing <erwin@FreeBSD.org>2012-12-05 13:00:54 +0000
committerErwin Lansing <erwin@FreeBSD.org>2012-12-05 13:00:54 +0000
commit2efa5510c3a664350be589050d2b3e8f34b7edb9 (patch)
treefb5de4b4b43b9fcca180a138b8c100801fe24bdd
parenta503af91a8a93bdaeb15b5467c2d98018eb719c5 (diff)
downloadsrc-2efa5510c3a664350be589050d2b3e8f34b7edb9.tar.gz
src-2efa5510c3a664350be589050d2b3e8f34b7edb9.zip
Vendor import of Bind 9.8.4-P1vendor/bind9/9.8.4-P1
Approved by: delphij (mentor) Sponsored by: DK Hostmaster A/S
Notes
Notes: svn path=/vendor/bind9/dist/; revision=243888 svn path=/vendor/bind9/9.8.4-P1/; revision=243889; tag=vendor/bind9/9.8.4-P1
-rw-r--r--CHANGES5
-rw-r--r--FREEBSD-Xlist1
-rw-r--r--bin/named/query.c4
-rw-r--r--version4
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 801f9918e5fe..6d1ee3109994 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
diff --git a/FREEBSD-Xlist b/FREEBSD-Xlist
index 4d4acf09b04f..e50a5cc8238e 100644
--- a/FREEBSD-Xlist
+++ b/FREEBSD-Xlist
@@ -11,6 +11,7 @@ docutil
isc-config.sh.1
isc-config.sh.docbook
isc-config.sh.html
+srcid
util
# Tests
diff --git a/bin/named/query.c b/bin/named/query.c
index 2bdaac820e46..9e67f2d2187f 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -5183,10 +5183,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t *version) {
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)
diff --git a/version b/version
index 3f4360ed2bfc..1090bee28cee 100644
--- a/version
+++ b/version
@@ -6,5 +6,5 @@
MAJORVER=9
MINORVER=8
PATCHVER=4
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1