From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 27 Sep 2021 12:28:16 +0000 (+0200)
Subject: resolved: suppress writing DNS server info into /etc/resolv.conf for non-standard... 
X-Git-Tag: v250-rc1~615
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a50dadf2fd7413bbfc26af7e2ad2900b3e06af82;p=thirdparty%2Fsystemd.git

resolved: suppress writing DNS server info into /etc/resolv.conf for non-standard UDP ports

glibc doesn't support this, hence don#t generate it.

Fixes: #20836
---

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index dd02d368e92..d5a77605a88 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -216,6 +216,13 @@ static void write_resolv_conf_server(DnsServer *s, FILE *f, unsigned *count) {
                 return;
         }
 
+        /* resolv.conf simply doesn't support any other ports than 53, hence there's nothing much we can
+         * do — we have to suppress these entries */
+        if (dns_server_port(s) != 53) {
+                log_debug("DNS server %s with non-standard UDP port number, suppressing from generated resolv.conf.", dns_server_string(s));
+                return;
+        }
+
         /* Check if the scope this DNS server belongs to is suitable as 'default' route for lookups; resolv.conf does
          * not have a syntax to express that, so it must not appear as a global name server to avoid routing unrelated
          * domains to it (which is a privacy violation, will most probably fail anyway, and adds unnecessary load) */