From bcd6fee1f4c344b9d9481f47292212f38c6b9099 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 17 Mar 2009 14:45:31 +0000 Subject: [PATCH] test and nicer error handling on target query failure. git-svn-id: file:///svn/unbound/trunk@1530 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ iterator/iterator.c | 8 ++++---- testdata/04-checkconf.tpkg | Bin 4844 -> 5021 bytes 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 8e691bb57..dd653e6f3 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +17 March 2009: Wouter + - unit test for unsupported algorithm in anchor warning. + - fixed so queries do not fail on opportunistic target queries. + 16 March 2009: Wouter - fixup diff error printout in contrib/update-itar.sh. - added contrib/unbound_cacti for statistics support in cacti, diff --git a/iterator/iterator.c b/iterator/iterator.c index 88873c15c..975577002 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c @@ -1288,14 +1288,14 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, /* if there is a policy to fetch missing targets * opportunistically, do it. we rely on the fact that once a * query (or queries) for a missing name have been issued, - * they will not be show up again. */ + * they will not show up again. */ } else if(tf_policy != 0) { int extra = 0; verbose(VERB_ALGO, "attempt to get extra %d targets", tf_policy); - if(!query_for_targets(qstate, iq, ie, id, tf_policy, &extra)) { - return error_response(qstate, id, LDNS_RCODE_SERVFAIL); - } + (void)query_for_targets(qstate, iq, ie, id, tf_policy, &extra); + /* errors ignored, these targets are not strictly necessary for + * this result, we do not have to reply with SERVFAIL */ iq->num_target_queries += extra; } diff --git a/testdata/04-checkconf.tpkg b/testdata/04-checkconf.tpkg index 82483e64c332f8f8cd01b88bd01386cc18fd250d..4b236ce9c6429828ee97b2deedd8624f6f3c97e5 100644 GIT binary patch literal 5021 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 literal 4844 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