patch security flaw [rt24777], prepare release of 9.6-ESV-R4-P2

diff --git a/CHANGES b/CHANGES
index cd744c6a77ac736890760396b36b3c659129f11b..500637233b39f8e6d03cc920eb04ae712e872e5a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+       --- 9.6-ESV-R4-P2 released ---
+
+3123.  [security]      Change #2912 exposed a latent flaw in
+                       dns_rdataset_totext() that could cause named to
+                       crash with an assertion failure. [RT #24777]
+
        --- 9.6-ESV-R4-P1 released ---
 
 3121.   [security]      An authoritative name server sending a negative

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 09bd401296cdf84c7c49f070f192d203580bf19f..886658917604d097c8e94b4f55efbfd6e06bbae3 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.245.50.7 2010/06/03 05:29:03 marka Exp $ */
+/* $Id: message.c,v 1.245.50.7.6.1 2011/06/08 22:03:10 each Exp $ */
 
 /*! \file */
 
@@ -2481,7 +2481,7 @@ dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section) {
            msg->opcode != dns_opcode_notify)
                want_question_section = ISC_FALSE;
        if (msg->opcode == dns_opcode_update)
-               first_section = DNS_SECTION_ADDITIONAL;
+               first_section = DNS_SECTION_PREREQUISITE;
        else if (want_question_section) {
                if (!msg->question_ok)
                        return (DNS_R_FORMERR);

diff --git a/version b/version
index f5a96bac83e1aca44814f71e1342a4e8da638911..8d9f41d00ecb1a9d9d20ad64c318990086ea4544 100644 (file)
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.43.12.11.2.2.2.1 2011/05/27 00:19:16 each Exp $
+# $Id: version,v 1.43.12.11.2.2.2.2 2011/06/08 22:03:10 each Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=6
 PATCHVER=
 RELEASETYPE=-ESV
-RELEASEVER=-R4-P1
+RELEASEVER=-R4-P2