Module Name: src Committed By: christos Date: Tue Nov 1 21:55:53 UTC 2016
Modified Files: src/external/bsd/bind/dist: CHANGES README srcid version src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html man.dnssec-dsfromkey.html man.dnssec-importkey.html man.dnssec-keyfromlabel.html man.dnssec-keygen.html man.dnssec-revoke.html man.dnssec-settime.html man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html man.host.html man.isc-hmac-fixup.html man.named-checkconf.html man.named-checkzone.html man.named-journalprint.html man.named-rrchecker.html man.named.html man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html man.rndc.html src/external/bsd/bind/dist/lib/dns: api resolver.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/CHANGES cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/README cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/srcid cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/dist/version cvs rdiff -u -r1.10 -r1.11 \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \ src/external/bsd/bind/dist/doc/arm/man.arpaname.html \ src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \ src/external/bsd/bind/dist/doc/arm/man.delv.html \ src/external/bsd/bind/dist/doc/arm/man.dig.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \ src/external/bsd/bind/dist/doc/arm/man.genrandom.html \ src/external/bsd/bind/dist/doc/arm/man.host.html \ src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \ src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \ src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \ src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \ src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \ src/external/bsd/bind/dist/doc/arm/man.named.html \ src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \ src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \ src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \ src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \ src/external/bsd/bind/dist/doc/arm/man.rndc.html cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf cvs rdiff -u -r1.10 -r1.11 src/external/bsd/bind/dist/lib/dns/api cvs rdiff -u -r1.26 -r1.27 src/external/bsd/bind/dist/lib/dns/resolver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/bind/dist/CHANGES diff -u src/external/bsd/bind/dist/CHANGES:1.22 src/external/bsd/bind/dist/CHANGES:1.23 --- src/external/bsd/bind/dist/CHANGES:1.22 Tue Oct 4 19:46:00 2016 +++ src/external/bsd/bind/dist/CHANGES Tue Nov 1 17:55:51 2016 @@ -1,3 +1,8 @@ + --- 9.10.4-P4 released --- + +4489. [security] It was possible to trigger assertions when processing + a response. (CVE-2016-8864) [RT #43465] + --- 9.10.4-P3 released --- 4468. [bug] Address ECS option handling issues. [RT #43191] Index: src/external/bsd/bind/dist/README diff -u src/external/bsd/bind/dist/README:1.10 src/external/bsd/bind/dist/README:1.11 --- src/external/bsd/bind/dist/README:1.10 Tue Oct 4 19:46:00 2016 +++ src/external/bsd/bind/dist/README Tue Nov 1 17:55:51 2016 @@ -51,6 +51,10 @@ BIND 9 For up-to-date release notes and errata, see http://www.isc.org/software/bind9/releasenotes +BIND 9.10.4-P4 + + This version contains a fix for CVE-2016-8864. + BIND 9.10.4-P3 This version contains a fix for CVE-2016-2776 and addresses Index: src/external/bsd/bind/dist/srcid diff -u src/external/bsd/bind/dist/srcid:1.16 src/external/bsd/bind/dist/srcid:1.17 --- src/external/bsd/bind/dist/srcid:1.16 Tue Oct 4 19:46:00 2016 +++ src/external/bsd/bind/dist/srcid Tue Nov 1 17:55:51 2016 @@ -1 +1 @@ -SRCID=7e49f11 +SRCID=853aa4b Index: src/external/bsd/bind/dist/version diff -u src/external/bsd/bind/dist/version:1.20 src/external/bsd/bind/dist/version:1.21 --- src/external/bsd/bind/dist/version:1.20 Tue Oct 4 19:46:00 2016 +++ src/external/bsd/bind/dist/version Tue Nov 1 17:55:51 2016 @@ -7,5 +7,5 @@ MAJORVER=9 MINORVER=10 PATCHVER=4 RELEASETYPE=-P -RELEASEVER=3 +RELEASEVER=4 EXTENSIONS= Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html:1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html:1.11 --- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html Tue Nov 1 17:55:51 2016 @@ -2326,6 +2326,6 @@ $ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2. </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html:1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html:1.11 --- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html Tue Nov 1 17:55:51 2016 @@ -12845,6 +12845,6 @@ HOST-127.EXAMPLE. MX 0 . </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html:1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html:1.11 --- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html Tue Nov 1 17:55:51 2016 @@ -248,6 +248,6 @@ zone "example.com" { </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html:1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html:1.11 --- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html Tue Nov 1 17:55:51 2016 @@ -134,6 +134,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html:1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html:1.11 --- src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html Tue Nov 1 17:55:51 2016 @@ -44,7 +44,7 @@ <div class="toc"> <p><b>Table of Contents</b></p> <dl class="toc"> -<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P3</a></span></dt> +<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P4</a></span></dt> <dd><dl> <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt> <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt> @@ -60,7 +60,7 @@ </div> <div class="section"> <div class="titlepage"><div><div><h2 class="title" style="clear: both"> -<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.4-P3</h2></div></div></div> +<a name="id-1.10.2"></a>Release Notes for BIND Version 9.10.4-P4</h2></div></div></div> <div class="section"> <div class="titlepage"><div><div><h3 class="title"> <a name="relnotes_intro"></a>Introduction</h3></div></div></div> @@ -68,6 +68,10 @@ This document summarizes changes since BIND 9.10.4: </p> <p> + BIND 9.10.4-P4 addresses the security issue described in + CVE-2016-8864. + </p> +<p> BIND 9.10.4-P3 addresses the security issue described in CVE-2016-2776 and addresses an interoperability issue with ECS clients. @@ -99,6 +103,10 @@ <a name="relnotes_security"></a>Security Fixes</h3></div></div></div> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "> <li class="listitem"><p> + It was possible to trigger assertions when processing + a response. This flaw is disclosed in CVE-2016-8864. [RT #43465] + </p></li> +<li class="listitem"><p> It was possible to trigger a assertion when rendering a message using a specially crafted request. This flaw is disclosed in CVE-2016-2776. [RT #43139] @@ -190,6 +198,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.html diff -u src/external/bsd/bind/dist/doc/arm/Bv9ARM.html:1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.html:1.11 --- src/external/bsd/bind/dist/doc/arm/Bv9ARM.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/Bv9ARM.html Tue Nov 1 17:55:52 2016 @@ -40,7 +40,7 @@ <div> <div><h1 class="title"> <a name="id-1"></a>BIND 9 Administrator Reference Manual</h1></div> -<div><p class="releaseinfo">BIND Version 9.10.4-P3</p></div> +<div><p class="releaseinfo">BIND Version 9.10.4-P4</p></div> <div><p class="copyright">Copyright © 2004-2015 Internet Systems Consortium, Inc. ("ISC")</p></div> <div><p class="copyright">Copyright © 2000-2003 Internet Software Consortium.</p></div> </div> @@ -239,7 +239,7 @@ </dl></dd> <dt><span class="appendix"><a href="Bv9ARM.ch09.html">A. Release Notes</a></span></dt> <dd><dl> -<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P3</a></span></dt> +<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes for BIND Version 9.10.4-P4</a></span></dt> <dd><dl> <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_intro">Introduction</a></span></dt> <dt><span class="section"><a href="Bv9ARM.ch09.html#relnotes_download">Download</a></span></dt> @@ -385,6 +385,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.arpaname.html diff -u src/external/bsd/bind/dist/doc/arm/man.arpaname.html:1.10 src/external/bsd/bind/dist/doc/arm/man.arpaname.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.arpaname.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.arpaname.html Tue Nov 1 17:55:52 2016 @@ -81,6 +81,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html diff -u src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html:1.10 src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html Tue Nov 1 17:55:52 2016 @@ -185,6 +185,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.delv.html diff -u src/external/bsd/bind/dist/doc/arm/man.delv.html:1.10 src/external/bsd/bind/dist/doc/arm/man.delv.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.delv.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.delv.html Tue Nov 1 17:55:52 2016 @@ -498,6 +498,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dig.html diff -u src/external/bsd/bind/dist/doc/arm/man.dig.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dig.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dig.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dig.html Tue Nov 1 17:55:52 2016 @@ -809,6 +809,6 @@ dig +qr www.isc.org any -x 127.0.0.1 isc </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html Tue Nov 1 17:55:52 2016 @@ -112,6 +112,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html Tue Nov 1 17:55:52 2016 @@ -219,6 +219,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html Tue Nov 1 17:55:52 2016 @@ -213,6 +213,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html Tue Nov 1 17:55:52 2016 @@ -177,6 +177,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html Tue Nov 1 17:55:52 2016 @@ -381,6 +381,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html Tue Nov 1 17:55:52 2016 @@ -455,6 +455,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html Tue Nov 1 17:55:52 2016 @@ -134,6 +134,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html Tue Nov 1 17:55:52 2016 @@ -264,6 +264,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html Tue Nov 1 17:55:52 2016 @@ -564,6 +564,6 @@ db.example.com.signed </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html diff -u src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html:1.10 src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html Tue Nov 1 17:55:52 2016 @@ -164,6 +164,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.genrandom.html diff -u src/external/bsd/bind/dist/doc/arm/man.genrandom.html:1.10 src/external/bsd/bind/dist/doc/arm/man.genrandom.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.genrandom.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.genrandom.html Tue Nov 1 17:55:52 2016 @@ -102,6 +102,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.host.html diff -u src/external/bsd/bind/dist/doc/arm/man.host.html:1.10 src/external/bsd/bind/dist/doc/arm/man.host.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.host.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.host.html Tue Nov 1 17:55:52 2016 @@ -247,6 +247,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html diff -u src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html:1.10 src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html Tue Nov 1 17:55:52 2016 @@ -112,6 +112,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html diff -u src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html:1.10 src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html Tue Nov 1 17:55:52 2016 @@ -151,6 +151,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html diff -u src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html:1.10 src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html Tue Nov 1 17:55:52 2016 @@ -338,6 +338,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html diff -u src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html:1.10 src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html Tue Nov 1 17:55:52 2016 @@ -102,6 +102,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html diff -u src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html:1.10 src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html Tue Nov 1 17:55:52 2016 @@ -104,6 +104,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.named.html diff -u src/external/bsd/bind/dist/doc/arm/man.named.html:1.10 src/external/bsd/bind/dist/doc/arm/man.named.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.named.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.named.html Tue Nov 1 17:55:52 2016 @@ -369,6 +369,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html diff -u src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html:1.10 src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html Tue Nov 1 17:55:52 2016 @@ -103,6 +103,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.nsupdate.html diff -u src/external/bsd/bind/dist/doc/arm/man.nsupdate.html:1.10 src/external/bsd/bind/dist/doc/arm/man.nsupdate.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.nsupdate.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.nsupdate.html Tue Nov 1 17:55:52 2016 @@ -663,6 +663,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html diff -u src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html:1.10 src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html Tue Nov 1 17:55:52 2016 @@ -223,6 +223,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html diff -u src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html:1.10 src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html Tue Nov 1 17:55:52 2016 @@ -246,6 +246,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/man.rndc.html diff -u src/external/bsd/bind/dist/doc/arm/man.rndc.html:1.10 src/external/bsd/bind/dist/doc/arm/man.rndc.html:1.11 --- src/external/bsd/bind/dist/doc/arm/man.rndc.html:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/doc/arm/man.rndc.html Tue Nov 1 17:55:52 2016 @@ -621,6 +621,6 @@ </tr> </table> </div> -<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P3</p> +<p xmlns:db="http://docbook.org/ns/docbook" style="text-align: center;">BIND 9.10.4-P4</p> </body> </html> Index: src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf Binary files are different Index: src/external/bsd/bind/dist/lib/dns/api diff -u src/external/bsd/bind/dist/lib/dns/api:1.10 src/external/bsd/bind/dist/lib/dns/api:1.11 --- src/external/bsd/bind/dist/lib/dns/api:1.10 Tue Oct 4 19:46:01 2016 +++ src/external/bsd/bind/dist/lib/dns/api Tue Nov 1 17:55:52 2016 @@ -6,5 +6,5 @@ # 9.9-sub: 130-139, 150-159 # 9.10: 140-149, 160-169 LIBINTERFACE = 165 -LIBREVISION = 2 +LIBREVISION = 3 LIBAGE = 0 Index: src/external/bsd/bind/dist/lib/dns/resolver.c diff -u src/external/bsd/bind/dist/lib/dns/resolver.c:1.26 src/external/bsd/bind/dist/lib/dns/resolver.c:1.27 --- src/external/bsd/bind/dist/lib/dns/resolver.c:1.26 Thu May 26 12:49:59 2016 +++ src/external/bsd/bind/dist/lib/dns/resolver.c Tue Nov 1 17:55:52 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: resolver.c,v 1.26 2016/05/26 16:49:59 christos Exp $ */ +/* $NetBSD: resolver.c,v 1.27 2016/11/01 21:55:52 christos Exp $ */ /* * Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC") @@ -623,7 +623,9 @@ valcreate(fetchctx_t *fctx, dns_adbaddri valarg->addrinfo = addrinfo; if (!ISC_LIST_EMPTY(fctx->validators)) - INSIST((valoptions & DNS_VALIDATOR_DEFER) != 0); + valoptions |= DNS_VALIDATOR_DEFER; + else + valoptions &= ~DNS_VALIDATOR_DEFER; result = dns_validator_create(fctx->res->view, name, type, rdataset, sigrdataset, fctx->rmessage, @@ -5554,13 +5556,6 @@ cache_name(fetchctx_t *fctx, dns_name_t rdataset, sigrdataset, valoptions, task); - /* - * Defer any further validations. - * This prevents multiple validators - * from manipulating fctx->rmessage - * simultaneously. - */ - valoptions |= DNS_VALIDATOR_DEFER; } } else if (CHAINING(rdataset)) { if (rdataset->type == dns_rdatatype_cname) @@ -5675,6 +5670,11 @@ cache_name(fetchctx_t *fctx, dns_name_t eresult == DNS_R_NCACHENXRRSET); } event->result = eresult; + if (adbp != NULL && *adbp != NULL) { + if (anodep != NULL && *anodep != NULL) + dns_db_detachnode(*adbp, anodep); + dns_db_detach(adbp); + } dns_db_attach(fctx->cache, adbp); dns_db_transfernode(fctx->cache, &node, anodep); clone_results(fctx); @@ -5925,6 +5925,11 @@ ncache_message(fetchctx_t *fctx, dns_adb fctx->attributes |= FCTX_ATTR_HAVEANSWER; if (event != NULL) { event->result = eresult; + if (adbp != NULL && *adbp != NULL) { + if (anodep != NULL && *anodep != NULL) + dns_db_detachnode(*adbp, anodep); + dns_db_detach(adbp); + } dns_db_attach(fctx->cache, adbp); dns_db_transfernode(fctx->cache, &node, anodep); clone_results(fctx); @@ -6746,13 +6751,15 @@ static isc_result_t answer_response(fetchctx_t *fctx) { isc_result_t result; dns_message_t *message; - dns_name_t *name, *dname = NULL, *qname, tname, *ns_name; + dns_name_t *name, *dname = NULL, *qname, *dqname, tname, *ns_name; + dns_name_t *cname = NULL; dns_rdataset_t *rdataset, *ns_rdataset; isc_boolean_t done, external, chaining, aa, found, want_chaining; - isc_boolean_t have_answer, found_cname, found_type, wanted_chaining; + isc_boolean_t have_answer, found_cname, found_dname, found_type; + isc_boolean_t wanted_chaining; unsigned int aflag; dns_rdatatype_t type; - dns_fixedname_t fdname, fqname; + dns_fixedname_t fdname, fqname, fqdname; dns_view_t *view; FCTXTRACE("answer_response"); @@ -6766,6 +6773,7 @@ answer_response(fetchctx_t *fctx) { done = ISC_FALSE; found_cname = ISC_FALSE; + found_dname = ISC_FALSE; found_type = ISC_FALSE; chaining = ISC_FALSE; have_answer = ISC_FALSE; @@ -6775,12 +6783,13 @@ answer_response(fetchctx_t *fctx) { aa = ISC_TRUE; else aa = ISC_FALSE; - qname = &fctx->name; + dqname = qname = &fctx->name; type = fctx->type; view = fctx->res->view; + dns_fixedname_init(&fqdname); result = dns_message_firstname(message, DNS_SECTION_ANSWER); while (!done && result == ISC_R_SUCCESS) { - dns_namereln_t namereln; + dns_namereln_t namereln, dnamereln; int order; unsigned int nlabels; @@ -6788,6 +6797,8 @@ answer_response(fetchctx_t *fctx) { dns_message_currentname(message, DNS_SECTION_ANSWER, &name); external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain)); namereln = dns_name_fullcompare(qname, name, &order, &nlabels); + dnamereln = dns_name_fullcompare(dqname, name, &order, + &nlabels); if (namereln == dns_namereln_equal) { wanted_chaining = ISC_FALSE; for (rdataset = ISC_LIST_HEAD(name->list); @@ -6882,7 +6893,7 @@ answer_response(fetchctx_t *fctx) { } } else if (rdataset->type == dns_rdatatype_rrsig && rdataset->covers == - dns_rdatatype_cname + dns_rdatatype_cname && !found_type) { /* * We're looking for something else, @@ -6912,11 +6923,18 @@ answer_response(fetchctx_t *fctx) { * a CNAME or DNAME). */ INSIST(!external); - if (aflag == - DNS_RDATASETATTR_ANSWER) { + if ((rdataset->type != + dns_rdatatype_cname) || + !found_dname || + (aflag == + DNS_RDATASETATTR_ANSWER)) + { have_answer = ISC_TRUE; + if (rdataset->type == + dns_rdatatype_cname) + cname = name; name->attributes |= - DNS_NAMEATTR_ANSWER; + DNS_NAMEATTR_ANSWER; } rdataset->attributes |= aflag; if (aa) @@ -7010,11 +7028,11 @@ answer_response(fetchctx_t *fctx) { return (DNS_R_FORMERR); } - if (namereln != dns_namereln_subdomain) { + if (dnamereln != dns_namereln_subdomain) { char qbuf[DNS_NAME_FORMATSIZE]; char obuf[DNS_NAME_FORMATSIZE]; - dns_name_format(qname, qbuf, + dns_name_format(dqname, qbuf, sizeof(qbuf)); dns_name_format(name, obuf, sizeof(obuf)); @@ -7029,7 +7047,7 @@ answer_response(fetchctx_t *fctx) { want_chaining = ISC_TRUE; POST(want_chaining); aflag = DNS_RDATASETATTR_ANSWER; - result = dname_target(rdataset, qname, + result = dname_target(rdataset, dqname, nlabels, &fdname); if (result == ISC_R_NOSPACE) { /* @@ -7046,10 +7064,13 @@ answer_response(fetchctx_t *fctx) { dname = dns_fixedname_name(&fdname); if (!is_answertarget_allowed(view, - qname, rdataset->type, - dname, &fctx->domain)) { + dqname, rdataset->type, + dname, &fctx->domain)) + { return (DNS_R_SERVFAIL); } + dqname = dns_fixedname_name(&fqdname); + dns_name_copy(dname, dqname, NULL); } else { /* * We've found a signature that @@ -7074,6 +7095,10 @@ answer_response(fetchctx_t *fctx) { INSIST(!external); if (aflag == DNS_RDATASETATTR_ANSWER) { have_answer = ISC_TRUE; + found_dname = ISC_TRUE; + if (cname != NULL) + cname->attributes &= + ~DNS_NAMEATTR_ANSWER; name->attributes |= DNS_NAMEATTR_ANSWER; }