chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
polkit: as we dropped support for the polkit bus transport, also drop its polkit...
[elogind.git]
/
src
/
resolve
/
resolved-conf.c
diff --git
a/src/resolve/resolved-conf.c
b/src/resolve/resolved-conf.c
index ae3773f4f7cd7d3d4f8e5bfceaacd43d0ff89219..63e87f8df52c44cae9d49c663d2af8cb442a58da 100644
(file)
--- a/
src/resolve/resolved-conf.c
+++ b/
src/resolve/resolved-conf.c
@@
-81,7
+81,6
@@
int config_parse_dnsv(
void *userdata) {
Manager *m = userdata;
void *userdata) {
Manager *m = userdata;
- DnsServer **l;
int r;
assert(filename);
int r;
assert(filename);
@@
-89,19
+88,10
@@
int config_parse_dnsv(
assert(rvalue);
assert(m);
assert(rvalue);
assert(m);
- if (ltype == DNS_SERVER_FALLBACK)
- l = &m->fallback_dns_servers;
- else
- l = &m->dns_servers;
-
- if (isempty(rvalue)) {
-
+ if (isempty(rvalue))
/* Empty assignment means clear the list */
/* Empty assignment means clear the list */
- while (*l)
- dns_server_free(*l);
-
- } else {
-
+ manager_flush_dns_servers(m, ltype);
+ else {
/* Otherwise add to the list */
r = manager_parse_dns_server(m, ltype, rvalue);
if (r < 0) {
/* Otherwise add to the list */
r = manager_parse_dns_server(m, ltype, rvalue);
if (r < 0) {