shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

resolved: minor dnssec fixups

Browse Source 
Fixes: ce5b9d5b3c ("resolved: request DS with DNSKEY")
This commit is contained in:
Ronan Pigott 2024-03-26 11:00:44 -07:00 committed by Yu Watanabe
parent 1e8c0c671e
commit 4001710365
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/resolve/resolved-dns-transaction.c
View File

@ -2318,13 +2318,18 @@ static int dns_transaction_request_dnssec_rr_full(DnsTransaction *t, DnsResource
if (r < 0)
return r;
if (ret)
*ret = NULL;
return 0;
}
/* This didn't work, ask for it via the network/cache then. */
r = dns_transaction_add_dnssec_transaction(t, key, &aux);
if (r == -ELOOP) /* This would result in a cyclic dependency */
if (r == -ELOOP) { /* This would result in a cyclic dependency */
if (ret)
*ret = NULL;
return 0;
}
if (r < 0)
return r;
@ -2490,7 +2495,7 @@ int dns_transaction_request_dnssec_keys(DnsTransaction *t) {
case DNS_TYPE_RRSIG: {
/* For each RRSIG we request the matching DNSKEY */
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *dnskey = NULL;
DnsTransaction *aux = NULL;
DnsTransaction *aux;
/* If this RRSIG is about a DNSKEY RR and the
* signer is the same as the owner, then we
@ -2537,6 +2542,8 @@ int dns_transaction_request_dnssec_keys(DnsTransaction *t) {
if (aux) {
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *ds =
dns_resource_key_new(rr->key->class, DNS_TYPE_DS, dns_resource_key_name(dnskey));
if (!ds)
return -ENOMEM;
r = dns_transaction_request_dnssec_rr(t, ds);
if (r < 0)
return r;