pullup:

1005.   [bug]           Don't copy nonzero RCODEs from request to response.
                        [RT #1765]

diff --git a/CHANGES b/CHANGES
index 9785bb71a1870771c75cb21da673d1e85fd429fc..7b2679d5747960b6c229d52cda462630c300ff13 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+1005.  [bug]           Don't copy nonzero RCODEs from request to response.
+                       [RT #1765]
+
 1004.  [port]          Deal with recvfrom() returning EHOSTDOWN. [RT #1770]
 
 1001.  [bug]           win32 socket code doio_recv was not catching a

diff --git a/bin/named/client.c b/bin/named/client.c
index dee00955ff0ce119010c99e66347dc3c20a0eaee..8de64d42d30f30c5a50ce24a91e3c02119e2d06f 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176 2001/08/08 22:54:18 gson Exp $ */
+/* $Id: client.c,v 1.176.2.1 2001/09/19 02:44:00 marka Exp $ */
 
 #include <config.h>
 
@@ -1370,6 +1370,8 @@ client_request(isc_task_t *task, isc_event_t *event) {
                goto cleanup;
        }
 
+       client->message->rcode = dns_rcode_noerror;
+
        /*
         * Deal with EDNS.
         */