test and nicer error handling on target query failure.

git-svn-id: file:///svn/unbound/trunk@1530 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 8e691bb57e70592f7e6b661a24791a23a488f97b..dd653e6f3af977b02a1cb53b0682c7213c1a4a01 100644 (file)
--- 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 88873c15c637ee2b00ecb7c84c936810ee47e8f3..97557700210a86202cf9d51ffff455373e8dbc02 100644 (file)
--- 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 (file)
Binary files a/testdata/04-checkconf.tpkg and b/testdata/04-checkconf.tpkg differ