From: Petr Menšík <pemensik@redhat.com>
Date: Wed, 17 Jan 2018 18:43:12 +0000 (+0100)
Subject: Reuse new function from rt46864 for similar block elsewhere.
X-Git-Tag: v9.13.0~161^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=e7a93321f095c8a2018df253a38bd1fc40d639cd;p=thirdparty%2Fbind9.git

Reuse new function from rt46864 for similar block elsewhere.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 32bd83f6cfd..8683d5333ee 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -3970,10 +3970,7 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) {
 	if (addrinfo == NULL) {
 		/* We have no more addresses.  Start over. */
 		fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
-		fctx_cleanupfinds(fctx);
-		fctx_cleanupaltfinds(fctx);
-		fctx_cleanupforwaddrs(fctx);
-		fctx_cleanupaltaddrs(fctx);
+		fctx_cleanupall(fctx);
 		result = fctx_getaddresses(fctx, badcache);
 		if (result == DNS_R_WAIT) {
 			/*
@@ -9028,10 +9025,7 @@ rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo,
 		fctx->ns_ttl = fctx->nameservers.ttl;
 		fctx->ns_ttl_ok = ISC_TRUE;
 		fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
-		fctx_cleanupfinds(fctx);
-		fctx_cleanupaltfinds(fctx);
-		fctx_cleanupforwaddrs(fctx);
-		fctx_cleanupaltaddrs(fctx);
+		fctx_cleanupall(fctx);
 	}
 
 	/*