From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 29 Jul 2014 19:46:12 +0000 (+0200)
Subject: resolved: we don't need the DNS server "source" concept anymore, remove it
X-Git-Tag: v216~393
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f82f5eae471a23a7aa9f40f19079a4b63e19496;p=thirdparty%2Fsystemd.git

resolved: we don't need the DNS server "source" concept anymore, remove it
---

diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index f33cf5d9613..2be81ff1d82 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);
         }
 
diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index 2736032ea6d..574616ef0fa 100644
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -30,16 +30,8 @@ typedef enum DnsServerSource DnsServerSource;
 #include "resolved-link.h"
 #include "resolved-dns-server.h"
 
-enum DnsServerSource {
-        DNS_SERVER_ANY,
-        DNS_SERVER_SYSTEM,
-        DNS_SERVER_LINK,
-        _DNS_SERVER_SOURCE_MAX
-};
-
 struct DnsServer {
         Manager *manager;
-        DnsServerSource source;
 
         Link *link;