colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: update nm-dhcp-systemd code for system-dhcp re-import

Browse Source 
Some of the patches we proposed were committed in slightly different
form.
This commit is contained in:
Dan Winship
2014-11-18 16:22:34 -05:00
parent 74678cf56b
commit e30b07149f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dhcp-manager/nm-dhcp-systemd.c
View File

@@ -389,7 +389,7 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
return NULL; return NULL;
path = get_leasefile_path (iface, uuid, FALSE); path = get_leasefile_path (iface, uuid, FALSE);
r = sd_dhcp_lease_load (path, &lease); r = sd_dhcp_lease_load (&lease, path);
if (r == 0) { if (r == 0) {
ip4_config = lease_to_ip4_config (lease, NULL, 0, FALSE, NULL); ip4_config = lease_to_ip4_config (lease, NULL, 0, FALSE, NULL);
if (ip4_config) if (ip4_config)
@@ -457,7 +457,7 @@ bound4_handle (NMDhcpSystemd *self)
add_requests_to_options (options, dhcp4_requests); add_requests_to_options (options, dhcp4_requests);
sd_dhcp_lease_save (lease, priv->lease_file); sd_dhcp_lease_save (lease, priv->lease_file);
client_id = sd_dhcp_client_get_client_id(priv->client4, &type, &client_id_len); sd_dhcp_client_get_client_id(priv->client4, &type, &client_id, &client_id_len);
if (client_id) if (client_id)
_save_client_id (self, type, client_id, client_id_len); _save_client_id (self, type, client_id, client_id_len);
@@ -576,7 +576,7 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
goto error; goto error;
} }
sd_dhcp_lease_load (priv->lease_file, &lease); sd_dhcp_lease_load (&lease, priv->lease_file);
if (last_ip4_address) if (last_ip4_address)
inet_pton (AF_INET, last_ip4_address, &last_addr); inet_pton (AF_INET, last_ip4_address, &last_addr);