result could be set incorrectly in validated()

during a recent refactoring of validated(), a line was
removed, causing 'result' to be left unchanged. this
wasted time continuing to try to validate when a
non-recoverable error had occured, and caused the wrong
reason to be logged in add_bad().

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 3d1fb3e14721a0b27068fe5c4720d518cff7573d..546a6ee2e845b2c8efed279632e793d1679940db 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -5435,8 +5435,8 @@ validated(void *arg) {
                FCTXTRACE("validation failed");
                inc_stats(res, dns_resstatscounter_valfail);
                fctx->valfail++;
-               fctx->vresult = val->result;
-               if (fctx->vresult != DNS_R_BROKENCHAIN) {
+               result = fctx->vresult = val->result;
+               if (result != DNS_R_BROKENCHAIN) {
                        if (val->rdataset != NULL) {
                                delete_rrset(fctx, val->name, val->type,
                                             val->sigrdataset != NULL);