From: Mark Andrews <marka@isc.org>
Date: Tue, 6 Aug 2002 00:35:01 +0000 (+0000)
Subject: 1352.   [bug]           dig, host, nslookup: when falling back to TCP use the
X-Git-Tag: v9.2.3rc1~104^2~407
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4c8f0896dc168160743473e97c799a130fced826;p=thirdparty%2Fbind9.git

1352.   [bug]           dig, host, nslookup: when falling back to TCP use the
                        current search list entry (if any). [RT #3374]
Original change missed one case.
---

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 27c43af3985..d8d8e39b63a 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.247 2002/08/02 12:49:46 marka Exp $ */
+/* $Id: dighost.c,v 1.248 2002/08/06 00:35:01 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -1691,7 +1691,7 @@ send_udp(dig_query_t *query) {
  */
 static void
 connect_timeout(isc_task_t *task, isc_event_t *event) {
-	dig_lookup_t *l = NULL;
+	dig_lookup_t *l = NULL, *n;
 	dig_query_t *query = NULL, *cq;
 
 	UNUSED(task);
@@ -1727,7 +1727,8 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
 			debug("making new TCP request, %d tries left",
 			      l->retries);
 			l->retries--;
-			requeue_lookup(l, ISC_TRUE);
+			n = requeue_lookup(l, ISC_TRUE);
+			n->origin = query->lookup->origin;
 			cancel_lookup(l);
 		}
 	} else {