2016. [bug] Return a partial answer if recursion is not

                        allowed but requested and we had the answer
                        to the original qname. [RT #15945]

diff --git a/CHANGES b/CHANGES
index b4a5b56e69676b0e265d1b46c8e73715c8db36ce..e733060f7a3e6b03d3bb616cf04dfb2f4c7dfe2a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2016.  [bug]           Return a partial answer if recursion is not
+                       allowed but requested and we had the answer
+                       to the original qname. [RT #15945]
 
        --- 9.4.0a5 released ---
 
@@ -159,7 +162,7 @@
                        Jason Vas Dias <jvdias@redhat.com>.
 
 1971.  [port]          linux: make detection of missing IF_NAMESIZE more
-                        robust. [RT #15443]
+                       robust. [RT #15443]
 
 1970.  [bug]           nsupdate: adjust UDP timeout when falling back to
                        unsigned SOA query. [RT #15775]
@@ -748,14 +751,14 @@
 
 1779.  [port]          OSF 5.1: libtool didn't handle -pthread correctly.
 
-1778.   [port]         HUX 11.11: fix broken IN6ADDR_ANY_INIT and
+1778.  [port]          HUX 11.11: fix broken IN6ADDR_ANY_INIT and
                        IN6ADDR_LOOPBACK_INIT macros.
 
-1777.   [port]         OSF 5.1: fix broken IN6ADDR_ANY_INIT and
+1777.  [port]          OSF 5.1: fix broken IN6ADDR_ANY_INIT and
                        IN6ADDR_LOOPBACK_INIT macros.
 
-1776.   [port]         Solaris 2.9: fix broken IN6ADDR_ANY_INIT and
-                        IN6ADDR_LOOPBACK_INIT macros.
+1776.  [port]          Solaris 2.9: fix broken IN6ADDR_ANY_INIT and
+                       IN6ADDR_LOOPBACK_INIT macros.
 
 1775.  [bug]           Only compile getnetent_r.c when threaded. [RT #13205]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 52f259cd0d006c666f420fc7f80b433a5bfe44c5..4ff81368cce6522477d8b1f269c8b26ca4c2d776 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.28 2006/03/09 23:46:20 marka Exp $ */
+/* $Id: query.c,v 1.257.18.29 2006/05/16 03:28:16 marka Exp $ */
 
 /*! \file */
 
@@ -3486,9 +3486,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                }
        }
        if (result != ISC_R_SUCCESS) {
-               if (result == DNS_R_REFUSED)
-                       QUERY_ERROR(DNS_R_REFUSED);
-               else
+               if (result == DNS_R_REFUSED) {
+                       if (!PARTIALANSWER(client))
+                               QUERY_ERROR(DNS_R_REFUSED);
+               } else
                        QUERY_ERROR(DNS_R_SERVFAIL);
                goto cleanup;
        }