From 7ae4ef6d23bc884d0e0ee2ec9cf87ec99d0686bb Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 16 Jan 2014 19:32:22 +0100 Subject: sd-dhcp-client: refactor DNS support Rather than keeping an array of pointers to addresses, just keep an array of addresses. --- src/network/networkd-manager.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/network/networkd-manager.c') diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index ca781e2bb4..3b542149c0 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -338,14 +338,15 @@ int manager_update_resolv_conf(Manager *m) { HASHMAP_FOREACH(link, m->links, i) { if (link->dhcp) { - struct in_addr **nameservers; + struct in_addr *nameservers; + size_t nameservers_size; - r = sd_dhcp_client_get_dns(link->dhcp, &nameservers); + r = sd_dhcp_client_get_dns(link->dhcp, &nameservers, &nameservers_size); if (r >= 0) { unsigned j; - for (j = 0; nameservers[j]; j++) - append_dns(f, nameservers[j], AF_INET, &count); + for (j = 0; j < nameservers_size; j++) + append_dns(f, &nameservers[j], AF_INET, &count); } } } -- cgit v1.2.3-54-g00ecf