chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: we don't need the DNS server "source" concept anymore, remove it
[elogind.git]
/
src
/
resolve
/
resolved-dns-server.c
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;
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);
} 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;
}
s->manager = m;
@@
-63,13
+61,10
@@
DnsServer* dns_server_free(DnsServer *s) {
if (!s)
return NULL;
if (!s)
return NULL;
- if (s->source == DNS_SERVER_LINK) {
-
+ if (s->manager) {
if (s->link)
LIST_REMOVE(servers, s->link->dns_servers, s);
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);
}
LIST_REMOVE(servers, s->manager->dns_servers, s);
}