Reuse new function from rt46864 for similar block elsewhere.

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 32bd83f6cfdef762ca7a4af290fd3310a6cab1f7..8683d5333eeb6270ea3d171de9e718fa13cc8964 100644 (file)
--- 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);
        }
 
        /*