2912. [func] Windows clients don't like UPDATE responses that clear

                        the zone section. [RT #20986]

diff --git a/CHANGES b/CHANGES
index 2356f604777d49f0d61b8cad7481632bcea6407d..db87ed2d743438a77a670d33adcc141cedbde158 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2912.  [func]          Windows clients don't like UPDATE responses that clear
+                       the zone section. [RT #20986]
+
 2911.  [bug]           dnssec-signzone didn't handle out of zone records well.
                        [RT #21367]
 

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 3bb5eda99096e545ec0e90bbe7988e99b8af1f4c..8eac143f52098a6d7086451a45cab72b7731ea29 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.253 2010/05/13 00:40:46 marka Exp $ */
+/* $Id: message.c,v 1.254 2010/06/03 05:23:27 marka Exp $ */
 
 /*! \file */
 
@@ -2527,7 +2527,9 @@ dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section) {
        if (msg->opcode != dns_opcode_query &&
            msg->opcode != dns_opcode_notify)
                want_question_section = ISC_FALSE;
-       if (want_question_section) {
+       if (msg->opcode == dns_opcode_update)
+               first_section = DNS_SECTION_ADDITIONAL;
+       else if (want_question_section) {
                if (!msg->question_ok)
                        return (DNS_R_FORMERR);
                first_section = DNS_SECTION_ANSWER;