Author: delphij
Date: Wed Nov  2 05:13:27 2016
New Revision: 308193
URL: https://svnweb.freebsd.org/changeset/base/308193

Log:
  MFV r308191:
  
  BIND 9.9.9-P4.

Modified:
  stable/9/contrib/bind9/CHANGES
  stable/9/contrib/bind9/README
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch11.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch12.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.ch13.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.html
  stable/9/contrib/bind9/doc/arm/Bv9ARM.pdf
  stable/9/contrib/bind9/doc/arm/man.arpaname.html
  stable/9/contrib/bind9/doc/arm/man.ddns-confgen.html
  stable/9/contrib/bind9/doc/arm/man.dig.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-checkds.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-coverage.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-importkey.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-keygen.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-revoke.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-settime.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-signzone.html
  stable/9/contrib/bind9/doc/arm/man.dnssec-verify.html
  stable/9/contrib/bind9/doc/arm/man.genrandom.html
  stable/9/contrib/bind9/doc/arm/man.host.html
  stable/9/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
  stable/9/contrib/bind9/doc/arm/man.lwresd.html
  stable/9/contrib/bind9/doc/arm/man.named-checkconf.html
  stable/9/contrib/bind9/doc/arm/man.named-checkzone.html
  stable/9/contrib/bind9/doc/arm/man.named-journalprint.html
  stable/9/contrib/bind9/doc/arm/man.named.conf.html
  stable/9/contrib/bind9/doc/arm/man.named.html
  stable/9/contrib/bind9/doc/arm/man.nsec3hash.html
  stable/9/contrib/bind9/doc/arm/man.nsupdate.html
  stable/9/contrib/bind9/doc/arm/man.rndc-confgen.html
  stable/9/contrib/bind9/doc/arm/man.rndc.conf.html
  stable/9/contrib/bind9/doc/arm/man.rndc.html
  stable/9/contrib/bind9/doc/arm/notes.html
  stable/9/contrib/bind9/doc/arm/notes.pdf
  stable/9/contrib/bind9/doc/arm/notes.xml
  stable/9/contrib/bind9/lib/dns/api
  stable/9/contrib/bind9/lib/dns/resolver.c
  stable/9/contrib/bind9/version
  stable/9/lib/bind/config.h
Directory Properties:
  stable/9/contrib/bind9/   (props changed)

Modified: stable/9/contrib/bind9/CHANGES
==============================================================================
--- stable/9/contrib/bind9/CHANGES      Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/CHANGES      Wed Nov  2 05:13:27 2016        
(r308193)
@@ -1,3 +1,8 @@
+       --- 9.9.9-P4 released ---
+
+4489.  [security]      It was possible to trigger assertions when processing
+                       a response. (CVE-2016-8864) [RT #43465]
+
        --- 9.9.9-P3 released ---
 
 4467.  [security]      It was possible to trigger a assertion when rendering

Modified: stable/9/contrib/bind9/README
==============================================================================
--- stable/9/contrib/bind9/README       Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/README       Wed Nov  2 05:13:27 2016        
(r308193)
@@ -51,6 +51,10 @@ BIND 9
        For up-to-date release notes and errata, see
        http://www.isc.org/software/bind9/releasenotes
 
+BIND 9.9.9-P4
+
+       This version contains a fix for CVE-2016-8864.
+
 BIND 9.9.9-P3
 
        This version contains a fix for CVE-2016-2776.

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch01.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch01.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch01.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -555,6 +555,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch02.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch02.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch02.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -153,6 +153,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch03.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch03.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch03.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -663,6 +663,6 @@ controls {
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch04.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch04.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch04.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -1960,6 +1960,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.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch05.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch05.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch05.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -138,6 +138,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch06.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch06.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch06.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -12314,6 +12314,6 @@ HOST-127.EXAMPLE. MX 0 .
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch07.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch07.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch07.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -248,6 +248,6 @@ zone "example.com" {
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch08.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch08.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch08.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -134,6 +134,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch09.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch09.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch09.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -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.9.9-P3</a></span></dt>
+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes 
for BIND Version 9.9.9-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.9.9-P3</h2></div></div></div>
+<a name="id-1.10.2"></a>Release Notes for BIND Version 
9.9.9-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,7 +68,11 @@
       This document summarizes changes since BIND 9.9.9:
     </p>
 <p>
-      BIND 9.10.9-P3 addresses the security issue described in
+      BIND 9.9.9-P4 addresses the security issue described in
+      CVE-2016-8864.
+    </p>
+<p>
+      BIND 9.9.9-P3 addresses the security issue described in
       CVE-2016-2776.
     </p>
 <p>
@@ -97,6 +101,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]
@@ -184,6 +192,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch10.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch10.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch10.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -155,6 +155,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch11.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch11.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch11.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -497,6 +497,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch12.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch12.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch12.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -539,6 +539,6 @@ $ <strong class="userinput"><code>sample
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.ch13.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.ch13.html     Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.ch13.html     Wed Nov  2 05:13:27 
2016        (r308193)
@@ -148,6 +148,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/Bv9ARM.html  Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/doc/arm/Bv9ARM.html  Wed Nov  2 05:13:27 2016        
(r308193)
@@ -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.9.9-P3</p></div>
+<div><p class="releaseinfo">BIND Version 9.9.9-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>
@@ -233,7 +233,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.9.9-P3</a></span></dt>
+<dt><span class="section"><a href="Bv9ARM.ch09.html#id-1.10.2">Release Notes 
for BIND Version 9.9.9-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>
@@ -373,6 +373,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/Bv9ARM.pdf
==============================================================================
Binary file (source and/or target). No diff available.

Modified: stable/9/contrib/bind9/doc/arm/man.arpaname.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.arpaname.html    Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.arpaname.html    Wed Nov  2 05:13:27 
2016        (r308193)
@@ -81,6 +81,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.ddns-confgen.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.ddns-confgen.html        Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.ddns-confgen.html        Wed Nov  2 
05:13:27 2016        (r308193)
@@ -170,6 +170,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dig.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dig.html Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dig.html Wed Nov  2 05:13:27 2016        
(r308193)
@@ -746,6 +746,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.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-checkds.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-checkds.html      Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-checkds.html      Wed Nov  2 
05:13:27 2016        (r308193)
@@ -112,6 +112,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-coverage.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-coverage.html     Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-coverage.html     Wed Nov  2 
05:13:27 2016        (r308193)
@@ -195,6 +195,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html    Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html    Wed Nov  2 
05:13:27 2016        (r308193)
@@ -213,6 +213,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-importkey.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-importkey.html    Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-importkey.html    Wed Nov  2 
05:13:27 2016        (r308193)
@@ -177,6 +177,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html Wed Nov  2 
05:13:27 2016        (r308193)
@@ -346,6 +346,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-keygen.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-keygen.html       Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-keygen.html       Wed Nov  2 
05:13:27 2016        (r308193)
@@ -448,6 +448,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-revoke.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-revoke.html       Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-revoke.html       Wed Nov  2 
05:13:27 2016        (r308193)
@@ -125,6 +125,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-settime.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-settime.html      Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-settime.html      Wed Nov  2 
05:13:27 2016        (r308193)
@@ -255,6 +255,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-signzone.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-signzone.html     Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-signzone.html     Wed Nov  2 
05:13:27 2016        (r308193)
@@ -538,6 +538,6 @@ db.example.com.signed
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.dnssec-verify.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.dnssec-verify.html       Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.dnssec-verify.html       Wed Nov  2 
05:13:27 2016        (r308193)
@@ -150,6 +150,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.genrandom.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.genrandom.html   Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.genrandom.html   Wed Nov  2 05:13:27 
2016        (r308193)
@@ -102,6 +102,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.host.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.host.html        Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.host.html        Wed Nov  2 05:13:27 
2016        (r308193)
@@ -248,6 +248,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.isc-hmac-fixup.html      Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.isc-hmac-fixup.html      Wed Nov  2 
05:13:27 2016        (r308193)
@@ -112,6 +112,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.lwresd.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.lwresd.html      Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.lwresd.html      Wed Nov  2 05:13:27 
2016        (r308193)
@@ -253,6 +253,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.named-checkconf.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.named-checkconf.html     Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.named-checkconf.html     Wed Nov  2 
05:13:27 2016        (r308193)
@@ -151,6 +151,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.named-checkzone.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.named-checkzone.html     Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.named-checkzone.html     Wed Nov  2 
05:13:27 2016        (r308193)
@@ -321,6 +321,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.named-journalprint.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.named-journalprint.html  Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.named-journalprint.html  Wed Nov  2 
05:13:27 2016        (r308193)
@@ -102,6 +102,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.named.conf.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.named.conf.html  Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.named.conf.html  Wed Nov  2 05:13:27 
2016        (r308193)
@@ -672,6 +672,6 @@ zone�<em class="replaceable"><code>strin
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.named.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.named.html       Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.named.html       Wed Nov  2 05:13:27 
2016        (r308193)
@@ -351,6 +351,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.nsec3hash.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.nsec3hash.html   Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.nsec3hash.html   Wed Nov  2 05:13:27 
2016        (r308193)
@@ -103,6 +103,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.nsupdate.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.nsupdate.html    Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.nsupdate.html    Wed Nov  2 05:13:27 
2016        (r308193)
@@ -639,6 +639,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.rndc-confgen.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.rndc-confgen.html        Wed Nov  2 
04:36:16 2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.rndc-confgen.html        Wed Nov  2 
05:13:27 2016        (r308193)
@@ -216,6 +216,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.rndc.conf.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.rndc.conf.html   Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.rndc.conf.html   Wed Nov  2 05:13:27 
2016        (r308193)
@@ -245,6 +245,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/man.rndc.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/man.rndc.html        Wed Nov  2 04:36:16 
2016        (r308192)
+++ stable/9/contrib/bind9/doc/arm/man.rndc.html        Wed Nov  2 05:13:27 
2016        (r308193)
@@ -581,6 +581,6 @@
 </tr>
 </table>
 </div>
-<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P3 (Extended Support Version)</p>
+<p xmlns:db="http://docbook.org/ns/docbook"; style="text-align: center;">BIND 
9.9.9-P4 (Extended Support Version)</p>
 </body>
 </html>

Modified: stable/9/contrib/bind9/doc/arm/notes.html
==============================================================================
--- stable/9/contrib/bind9/doc/arm/notes.html   Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/doc/arm/notes.html   Wed Nov  2 05:13:27 2016        
(r308193)
@@ -21,7 +21,7 @@
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" 
alink="#0000FF"><div class="article"><div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id-1.2"></a>Release Notes for BIND Version 
9.9.9-P3</h2></div></div></div>
+<a name="id-1.2"></a>Release Notes for BIND Version 
9.9.9-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>
@@ -29,7 +29,11 @@
       This document summarizes changes since BIND 9.9.9:
     </p>
 <p>
-      BIND 9.10.9-P3 addresses the security issue described in
+      BIND 9.9.9-P4 addresses the security issue described in
+      CVE-2016-8864.
+    </p>
+<p>
+      BIND 9.9.9-P3 addresses the security issue described in
       CVE-2016-2776.
     </p>
 <p>
@@ -58,6 +62,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]

Modified: stable/9/contrib/bind9/doc/arm/notes.pdf
==============================================================================
Binary file (source and/or target). No diff available.

Modified: stable/9/contrib/bind9/doc/arm/notes.xml
==============================================================================
--- stable/9/contrib/bind9/doc/arm/notes.xml    Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/doc/arm/notes.xml    Wed Nov  2 05:13:27 2016        
(r308193)
@@ -24,7 +24,11 @@
       This document summarizes changes since BIND 9.9.9:
     </para>
     <para>
-      BIND 9.10.9-P3 addresses the security issue described in
+      BIND 9.9.9-P4 addresses the security issue described in
+      CVE-2016-8864.
+    </para>
+    <para>
+      BIND 9.9.9-P3 addresses the security issue described in
       CVE-2016-2776.
     </para>
     <para>
@@ -53,6 +57,12 @@
     <itemizedlist>
       <listitem>
        <para>
+         It was possible to trigger assertions when processing
+         a response. This flaw is disclosed in CVE-2016-8864. [RT #43465]
+       </para>
+      </listitem>
+      <listitem>
+       <para>
          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]

Modified: stable/9/contrib/bind9/lib/dns/api
==============================================================================
--- stable/9/contrib/bind9/lib/dns/api  Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/lib/dns/api  Wed Nov  2 05:13:27 2016        
(r308193)
@@ -7,5 +7,5 @@
 # 9.10: 140-149
 # 9.11: 160-169
 LIBINTERFACE = 172
-LIBREVISION = 2
+LIBREVISION = 3
 LIBAGE = 0

Modified: stable/9/contrib/bind9/lib/dns/resolver.c
==============================================================================
--- stable/9/contrib/bind9/lib/dns/resolver.c   Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/lib/dns/resolver.c   Wed Nov  2 05:13:27 2016        
(r308193)
@@ -593,7 +593,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,
@@ -5277,13 +5279,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)
@@ -5396,6 +5391,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);
@@ -5643,6 +5643,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);
@@ -6464,13 +6469,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");
@@ -6484,6 +6491,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;
@@ -6493,12 +6501,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;
 
@@ -6506,6 +6515,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);
@@ -6600,7 +6611,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,
@@ -6630,11 +6641,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)
@@ -6728,11 +6746,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));
@@ -6747,7 +6765,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) {
                                                /*
@@ -6764,10 +6782,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
@@ -6792,6 +6813,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;
                                        }

Modified: stable/9/contrib/bind9/version
==============================================================================
--- stable/9/contrib/bind9/version      Wed Nov  2 04:36:16 2016        
(r308192)
+++ stable/9/contrib/bind9/version      Wed Nov  2 05:13:27 2016        
(r308193)
@@ -7,5 +7,5 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=9
 RELEASETYPE=-P
-RELEASEVER=3
+RELEASEVER=4
 EXTENSIONS=

Modified: stable/9/lib/bind/config.h
==============================================================================
--- stable/9/lib/bind/config.h  Wed Nov  2 04:36:16 2016        (r308192)
+++ stable/9/lib/bind/config.h  Wed Nov  2 05:13:27 2016        (r308193)
@@ -3,7 +3,7 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2014  Internet Systems 
Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012, 2014, 2016  Internet Systems 
Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -153,6 +153,9 @@ int sigwait(const unsigned int *set, int
 /* Define if threads need PTHREAD_SCOPE_SYSTEM */
 /* #undef NEED_PTHREAD_SCOPE_SYSTEM */
 
+/* Define to 1 if you have the uname library function. */
+#define HAVE_UNAME 1
+
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
@@ -194,6 +197,9 @@ int sigwait(const unsigned int *set, int
    MSVC and with C++ compilers. */
 #define FLEXIBLE_ARRAY_MEMBER /**/
 
+/* Define to 1 if the compiler supports __builtin_expect. */
+#define HAVE_BUILTIN_EXPECT 1
+
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
 
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to