X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=c108ad235828a389ef33c675190c31765b82766b;hb=edb85f0d8d0a84f27308a3728f3fde3c52b9dce2;hp=45c1ab0f4c9a1346a53a10fd9f917d998958b019;hpb=326cb4061a7d6ec4107f298b6f947d645512ad76;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 45c1ab0f4..c108ad235 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -89,8 +89,10 @@ static int network_load_one(Manager *manager, const char *filename) { network->dhcp_dns = true; network->dhcp_hostname = true; network->dhcp_domainname = true; + network->dhcp_routes = true; + network->dhcp_sendhost = true; - r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup, + r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0", config_item_perf_lookup, (void*) network_network_gperf_lookup, false, false, network); if (r < 0) { log_warning("Could not parse config file %s: %s", filename, strerror(-r)); @@ -164,6 +166,7 @@ void network_free(Network *network) { free(network->match_name); free(network->description); + free(network->dhcp_vendor_class_identifier); while ((address = network->ntp)) { LIST_REMOVE(addresses, network->ntp, address); @@ -179,6 +182,8 @@ void network_free(Network *network) { netdev_unref(network->bond); + netdev_unref(network->tunnel); + HASHMAP_FOREACH(netdev, network->vlans, i) netdev_unref(netdev); hashmap_free(network->vlans);