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 f33cf5d9613a64eef6611f139cad0bd4301433fd..2be81ff1d828fba1e123a82ede456c5628c9d3e4 100644 (file)
--- 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 2736032ea6d4e6ffce258486269e441e2165ad45..574616ef0fa625c3ee3567af139fd666317e30d2 100644 (file)
--- 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;