mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Reuse new function from rt46864 for similar block elsewhere.

Browse Source
This commit is contained in:
Petr Menšík
2018-01-17 19:43:12 +01:00
parent 313e73354d
commit e7a93321f0
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/resolver.c
View File

@@ -3970,10 +3970,7 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) {
if (addrinfo == NULL) { if (addrinfo == NULL) {
/* We have no more addresses. Start over. */ /* We have no more addresses. Start over. */
fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE); fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
fctx_cleanupfinds(fctx); fctx_cleanupall(fctx);
fctx_cleanupaltfinds(fctx);
fctx_cleanupforwaddrs(fctx);
fctx_cleanupaltaddrs(fctx);
result = fctx_getaddresses(fctx, badcache); result = fctx_getaddresses(fctx, badcache);
if (result == DNS_R_WAIT) { 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 = fctx->nameservers.ttl;
fctx->ns_ttl_ok = ISC_TRUE; fctx->ns_ttl_ok = ISC_TRUE;
fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE); fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
fctx_cleanupfinds(fctx); fctx_cleanupall(fctx);
fctx_cleanupaltfinds(fctx);
fctx_cleanupforwaddrs(fctx);
fctx_cleanupaltaddrs(fctx);
} }
/* /*