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:13:44 +0100 |
| commit | 3bfa393198800857f73863648aca4b3bda276e5e (patch) | |
| tree | 27bfd75c5e388757d2157c3fa95e6abb4aa4ca62 | |
| parent | 0d9b74ad25c2def92c8e8139f50087b4e64c8d83 (diff) | |
| download | systemd-3bfa393198800857f73863648aca4b3bda276e5e.tar.gz | |
resolved: propagate correct error variable
(cherry picked from commit 4cba52cc7a2191d0b38e605801c60d8648bc67e2)
(cherry picked from commit 78415ea9f7de25fc883af980e91fbffadd5a38b5)
| -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 a238275238..f4e6bdc530 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -892,12 +892,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); @@ -906,7 +906,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)); } |