resolved: drop duplicated check
The same conditional appears a few lines down.
This commit is contained in:
parent
44ab234734
commit
c4c6ee3a95
|
@ -35,9 +35,6 @@ static int manager_add_dns_server_by_string(Manager *m, DnsServerType type, cons
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
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) */
|
/* Silently filter out 0.0.0.0 and 127.0.0.53 (our own stub DNS listener) */
|
||||||
if (!dns_server_address_valid(family, &address))
|
if (!dns_server_address_valid(family, &address))
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -50,12 +47,8 @@ static int manager_add_dns_server_by_string(Manager *m, DnsServerType type, cons
|
||||||
/* Filter out duplicates */
|
/* Filter out duplicates */
|
||||||
s = dns_server_find(manager_get_first_dns_server(m, type), family, &address, port, ifindex, server_name);
|
s = dns_server_find(manager_get_first_dns_server(m, type), family, &address, port, ifindex, server_name);
|
||||||
if (s) {
|
if (s) {
|
||||||
/*
|
/* Drop the marker. This is used to find the servers that ceased to exist, see
|
||||||
* Drop the marker. This is used to find the servers
|
* manager_mark_dns_servers() and manager_flush_marked_dns_servers(). */
|
||||||
* that ceased to exist, see
|
|
||||||
* manager_mark_dns_servers() and
|
|
||||||
* manager_flush_marked_dns_servers().
|
|
||||||
*/
|
|
||||||
dns_server_move_back_and_unmark(s);
|
dns_server_move_back_and_unmark(s);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue