From 2efa5510c3a664350be589050d2b3e8f34b7edb9 Mon Sep 17 00:00:00 2001 From: Erwin Lansing Date: Wed, 5 Dec 2012 13:00:54 +0000 Subject: Vendor import of Bind 9.8.4-P1 Approved by: delphij (mentor) Sponsored by: DK Hostmaster A/S --- CHANGES | 5 +++++ FREEBSD-Xlist | 1 + bin/named/query.c | 4 +++- version | 4 ++-- 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 -- cgit v1.3