Skip to content

Commit

Permalink
resolved: always progress DS queries
Browse files Browse the repository at this point in the history
If we request a DS and the resolver offers an unsigned SOA, a new
auxiliary transaction for the DS will be rejected as a loop, and we
might not make any progress toward finding the DS we need. Let's ensure
that we at least always check the parent in this case.

Fixes: 4769063 ("resolved: don't request the SOA for every dns label")
(cherry picked from commit d840783)
(cherry picked from commit 52c17fe)
  • Loading branch information
rpigott authored and bluca committed May 9, 2024
1 parent cf84d7f commit 16c79fe
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/resolve/resolved-dns-transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -2525,6 +2525,10 @@ int dns_transaction_request_dnssec_keys(DnsTransaction *t) {
return r;
if (r == 0)
continue;

/* If we were looking for the DS RR, don't request it again. */
if (dns_transaction_key(t)->type == DNS_TYPE_DS)
continue;
}

r = dnssec_has_rrsig(t->answer, rr->key);
Expand Down

0 comments on commit 16c79fe

Please sign in to comment.