From: W.C.A. Wijngaards Date: Fri, 25 Feb 2022 14:24:40 +0000 (+0100) Subject: - Fix check interface existence for support detection in remote lookup. X-Git-Tag: release-1.16.0rc1~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c084c27b392b0d98173e8c246b9bf69b95c800b0;p=thirdparty%2Funbound.git - Fix check interface existence for support detection in remote lookup. --- diff --git a/Makefile.in b/Makefile.in index 8e55527a5..0c223eb8d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1248,7 +1248,7 @@ cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h $(srcdir)/daemon $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \ $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h \ $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/util/config_file.h + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/util/config_file.h $(srcdir)/services/outside_network.h daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \ $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ diff --git a/daemon/cachedump.c b/daemon/cachedump.c index 8a8694c42..b929f909b 100644 --- a/daemon/cachedump.c +++ b/daemon/cachedump.c @@ -47,6 +47,7 @@ #include "services/cache/rrset.h" #include "services/cache/dns.h" #include "services/cache/infra.h" +#include "services/outside_network.h" #include "util/data/msgreply.h" #include "util/regional.h" #include "util/net_help.h" @@ -856,7 +857,8 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm, } /* go up? */ if(iter_dp_is_useless(&qinfo, BIT_RD, dp, - worker->env.cfg->do_ip4, worker->env.cfg->do_ip6)) { + (worker->env.cfg->do_ip4 && worker->back->num_ip4 != 0), + (worker->env.cfg->do_ip6 && worker->back->num_ip6 != 0))) { print_dp_main(ssl, dp, msg); print_dp_details(ssl, worker, dp); if(!ssl_printf(ssl, "cache delegation was " diff --git a/doc/Changelog b/doc/Changelog index 8061c0217..e156b6d7c 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ - Fix to detect that no IPv6 support means that IPv6 addresses are useless for delegation point lookups. - update Makefile dependencies. + - Fix check interface existence for support detection in remote lookup. 18 February 2022: Wouter - Fix that address not available is squelched from the logs for