networkd: merge DNS and NTP entries when exporting

In the state files, do not distinguish where the various entries came from
(static or DHCP), but include them all in the same list.
This commit is contained in:
Tom Gundersen
2014-07-23 23:54:51 +02:00
parent 36d054aae0
commit b0e39c8284
9 changed files with 56 additions and 156 deletions
+2 -9
View File
@@ -169,15 +169,8 @@ void network_free(Network *network) {
free(network->description);
free(network->dhcp_vendor_class_identifier);
while ((address = network->ntp)) {
LIST_REMOVE(addresses, network->ntp, address);
address_free(address);
}
while ((address = network->dns)) {
LIST_REMOVE(addresses, network->dns, address);
address_free(address);
}
strv_free(network->ntp);
strv_free(network->dns);
netdev_unref(network->bridge);