From 2f82f5eae471a23a7aa9f40f19079a4b63e19496 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 29 Jul 2014 21:46:12 +0200 Subject: resolved: we don't need the DNS server "source" concept anymore, remove it --- src/resolve/resolved-dns-server.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/resolve/resolved-dns-server.c') diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index f33cf5d961..2be81ff1d8 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -44,11 +44,9 @@ int dns_server_new( LIST_FIND_TAIL(servers, l->dns_servers, tail); LIST_INSERT_AFTER(servers, l->dns_servers, tail, s); s->link = l; - s->source = DNS_SERVER_LINK; } else { LIST_FIND_TAIL(servers, m->dns_servers, tail); LIST_INSERT_AFTER(servers, m->dns_servers, tail, s); - s->source = DNS_SERVER_SYSTEM; } s->manager = m; @@ -63,13 +61,10 @@ DnsServer* dns_server_free(DnsServer *s) { if (!s) return NULL; - if (s->source == DNS_SERVER_LINK) { - + if (s->manager) { if (s->link) LIST_REMOVE(servers, s->link->dns_servers, s); - } else if (s->source == DNS_SERVER_SYSTEM) { - - if (s->manager) + else LIST_REMOVE(servers, s->manager->dns_servers, s); } -- cgit v1.2.3-54-g00ecf