Reuse new function from rt46864 for similar block elsewhere.

(cherry picked from commit e7a93321f095c8a2018df253a38bd1fc40d639cd)
(cherry picked from commit cb98ce8e676990807184e21139d5bf2a63c1890b)
(cherry picked from commit 687650160506ed30ae41319aaf5ca7883ddc5b32)
(cherry picked from commit 16ea60d8ccd46e1dd9cf62ed07cd039090e53fce)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index c708e6815c7b889362bb15da31d7b9e793c9de3f..977afb9a5a4cdf1a81714618780f6b9965de416b 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -3411,10 +3411,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) {
                        /*