diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-07-23 23:10:00 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-07-23 23:54:52 +0200 |
| commit | 6073b6f26ab9fc6bf335faa7073ec443eef093fd (patch) | |
| tree | d851475cf1dc89b22f454d1577dd976196b4ef88 /src/resolve/resolved-manager.c | |
| parent | b0e39c8284b5195850a58e4efcce2f059bdcc6ad (diff) | |
resolved: don't read DHCP leases
networkd will expose both statically configured DNS servers and servers
receieved over DHCP in sd_network_get_dns(), so no need to keep
the distinction in resolved.
Diffstat (limited to 'src/resolve/resolved-manager.c')
| -rw-r--r-- | src/resolve/resolved-manager.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 19ea678de0..f4fa197d49 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -29,8 +29,6 @@ #include "rtnl-util.h" #include "event-util.h" #include "network-util.h" -#include "sd-dhcp-lease.h" -#include "dhcp-lease-internal.h" #include "network-internal.h" #include "conf-parser.h" #include "socket-util.h" @@ -326,7 +324,7 @@ static int parse_dns_server_string(Manager *m, const char *string) { if (manager_find_dns_server(m, family, &addr)) continue; - r = dns_server_new(m, NULL, DNS_SERVER_SYSTEM, NULL, family, &addr); + r = dns_server_new(m, NULL, NULL, family, &addr); if (r < 0) return r; } @@ -517,13 +515,9 @@ int manager_write_resolv_conf(Manager *m) { "# resolv.conf(5) in a different way, replace the symlink by a\n" "# static file or a different symlink.\n\n", f); - HASHMAP_FOREACH(l, m->links, i) { - LIST_FOREACH(servers, s, l->link_dns_servers) - write_resolve_conf_server(s, f, &count); - - LIST_FOREACH(servers, s, l->dhcp_dns_servers) + HASHMAP_FOREACH(l, m->links, i) + LIST_FOREACH(servers, s, l->dns_servers) write_resolve_conf_server(s, f, &count); - } LIST_FOREACH(servers, s, m->dns_servers) write_resolve_conf_server(s, f, &count); |