X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-conf.c;h=63e87f8df52c44cae9d49c663d2af8cb442a58da;hp=ae3773f4f7cd7d3d4f8e5bfceaacd43d0ff89219;hb=56f64d95763a799ba4475daf44d8e9f72a1bd474;hpb=5cb36f41f01cf4b1f4395abfffd1b33116591e58 diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index ae3773f4f..63e87f8df 100644 --- 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; - DnsServer **l; int r; assert(filename); @@ -89,19 +88,10 @@ int config_parse_dnsv( 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 */ - 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) {