resolved: actually use the specified rrsig argument

poettering · keszybz · commit 048e04337571 · 2021-02-23T01:52:33.000+01:00
The argument only exists to be used to override/fill in the RRSIG record of the answer item. Hence actually use it instead of ignore it. (Not sure how this got lost earlier.) Fixes: systemd#18714
diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
@@ -668,7 +668,7 @@ int dns_answer_copy_by_key(
                 if (r < 0)
                         return r;
 
-                r = dns_answer_add(*a, item->rr, item->ifindex, item->flags|or_flags, item->rrsig);
+                r = dns_answer_add(*a, item->rr, item->ifindex, item->flags|or_flags, rrsig ?: item->rrsig);
                 if (r < 0)
                         return r;
         }

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ int dns_answer_copy_by_key(`
`668`	`668`	`if (r < 0)`
`669`	`669`	`return r;`
`670`	`670`
`671`		`- r = dns_answer_add(*a, item->rr, item->ifindex, item->flags\|or_flags, item->rrsig);`
	`671`	`+ r = dns_answer_add(*a, item->rr, item->ifindex, item->flags\|or_flags, rrsig ?: item->rrsig);`
`672`	`672`	`if (r < 0)`
`673`	`673`	`return r;`
`674`	`674`	`}`