From: Mark Andrews <marka@isc.org>
Date: Wed, 19 Sep 2001 02:44:00 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.2.0rc4~17
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=99a0822e3c72f73727f8b4c5ed7504266364bf8d;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 9785bb71a18..7b2679d5747 100644
--- 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 dee00955ff0..8de64d42d30 100644
--- 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.
 	 */