summaryrefslogtreecommitdiffstats
path: root/src/resolve
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-09-05 21:14:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-09-10 00:46:44 +0200
commitc4c6ee3a959f0f082f232790677709e01b862fa9 (patch)
tree17d1db2eb11cb883adbbc6bf855d1aab02c19490 /src/resolve
parentshared: don't unconditionally set SOCK_STREAM as type in socket_address_parse() (diff)
downloadsystemd-c4c6ee3a959f0f082f232790677709e01b862fa9.tar.xz
systemd-c4c6ee3a959f0f082f232790677709e01b862fa9.zip
resolved: drop duplicated check
The same conditional appears a few lines down.
Diffstat (limited to 'src/resolve')
-rw-r--r--src/resolve/resolved-conf.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 08655e115d..2d85cc4ecd 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -35,9 +35,6 @@ static int manager_add_dns_server_by_string(Manager *m, DnsServerType type, cons
if (r < 0)
return r;
- if (IN_SET(port, 53, 853))
- port = 0;
-
/* Silently filter out 0.0.0.0 and 127.0.0.53 (our own stub DNS listener) */
if (!dns_server_address_valid(family, &address))
return 0;
@@ -50,12 +47,8 @@ static int manager_add_dns_server_by_string(Manager *m, DnsServerType type, cons
/* Filter out duplicates */
s = dns_server_find(manager_get_first_dns_server(m, type), family, &address, port, ifindex, server_name);
if (s) {
- /*
- * Drop the marker. This is used to find the servers
- * that ceased to exist, see
- * manager_mark_dns_servers() and
- * manager_flush_marked_dns_servers().
- */
+ /* Drop the marker. This is used to find the servers that ceased to exist, see
+ * manager_mark_dns_servers() and manager_flush_marked_dns_servers(). */
dns_server_move_back_and_unmark(s);
return 0;
}