diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-03-22 18:27:36 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-23 10:00:42 +0100 |
| commit | 78415ea9f7de25fc883af980e91fbffadd5a38b5 (patch) | |
| tree | 71d607c69bca77201c3ad08a29056659bfb894ba | |
| parent | dabf9f2109e5b8cc26d9e0d9188deebff3edf8c2 (diff) | |
| download | systemd-78415ea9f7de25fc883af980e91fbffadd5a38b5.tar.gz | |
resolved: propagate correct error variable
(cherry picked from commit 4cba52cc7a2191d0b38e605801c60d8648bc67e2)
| -rw-r--r-- | src/resolve/resolved-dns-query.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index f6ff3b5388..9d3aa677a0 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -896,12 +896,12 @@ static int dns_query_cname_redirect(DnsQuery *q, const DnsResourceRecord *cname) r = dns_question_cname_redirect(q->question_idna, cname, &nq_idna); if (r < 0) return r; - else if (r > 0) + if (r > 0) log_debug("Following CNAME/DNAME %s → %s.", dns_question_first_name(q->question_idna), dns_question_first_name(nq_idna)); k = dns_question_is_equal(q->question_idna, q->question_utf8); if (k < 0) - return r; + return k; if (k > 0) { /* Same question? Shortcut new question generation */ nq_utf8 = dns_question_ref(nq_idna); @@ -910,7 +910,7 @@ static int dns_query_cname_redirect(DnsQuery *q, const DnsResourceRecord *cname) k = dns_question_cname_redirect(q->question_utf8, cname, &nq_utf8); if (k < 0) return k; - else if (k > 0) + if (k > 0) log_debug("Following UTF8 CNAME/DNAME %s → %s.", dns_question_first_name(q->question_utf8), dns_question_first_name(nq_utf8)); } |