2516. [bug] glue sort for responses was performed even when not

			needed. [RT #19039]

diff --git a/CHANGES b/CHANGES
index 624b0c363eecb3cf002f0312a590bebd4c4306cf..f72a4ee9ebe9d819fc481c284f6035ff1ca9b46f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2516.  [bug]           glue sort for responses was performed even when not
+                       needed. [RT #19039]
+
 2514.  [bug]           dig/host failed with -4 or -6 when resolv.conf contains
                        a nameserver of the unsupported address family.
                        [RT #18848]

diff --git a/bin/named/query.c b/bin/named/query.c
index 5cafbc9e45a8f8688936056c8c3df9c795621f9a..2940dcc61c556ba88d99caf273bfa2ad964edcbc 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.257.18.46 2008/10/15 22:33:01 marka Exp $ */
+/* $Id: query.c,v 1.257.18.47 2008/12/16 02:21:19 jinmei Exp $ */
 
 /*! \file */
 
@@ -4405,7 +4405,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                 * is in the glue sort it to the start of the additional
                 * section.
                 */
-               if (client->message->counts[DNS_SECTION_ANSWER] == 0 &&
+               if (ISC_LIST_EMPTY(client->message->sections[DNS_SECTION_ANSWER]) &&
                    client->message->rcode == dns_rcode_noerror &&
                    (qtype == dns_rdatatype_a || qtype == dns_rdatatype_aaaa))
                        answer_in_glue(client, qtype);