From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Feb 2021 23:07:12 +0000 (+0100)
Subject: resolved: actually use the specified rrsig argument
X-Git-Tag: v248-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=048e04337571c8ac68a12fcb02a82db58bab22ca;p=thirdparty%2Fsystemd.git

resolved: actually use the specified rrsig argument

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: #18714
---

diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
index aac34575d4f..ce3cbce308d 100644
--- 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;
         }