From cb98ce8e676990807184e21139d5bf2a63c1890b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Wed, 17 Jan 2018 19:43:12 +0100 Subject: [PATCH] Reuse new function from rt46864 for similar block elsewhere. (cherry picked from commit e7a93321f095c8a2018df253a38bd1fc40d639cd) --- lib/dns/resolver.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 4bd04120b2..517d7db8f3 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -3987,10 +3987,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) { /* @@ -9045,10 +9042,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); } /*