diff options
| author | Dan Winship <danw@redhat.com> | 2014-11-18 16:22:34 -0500 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2014-11-19 12:02:17 -0500 |
| commit | e30b07149f889ef8480b6f14030a1b6bda521e43 (patch) | |
| tree | 99eb83c85d0949fba794486e8670b60855044862 | |
| parent | 74678cf56ba242104f680e01e3c7e85c0c2adc43 (diff) | |
| download | NetworkManager-e30b07149f889ef8480b6f14030a1b6bda521e43.tar.gz | |
dhcp: update nm-dhcp-systemd code for system-dhcp re-import
Some of the patches we proposed were committed in slightly different
form.
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-systemd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index ecb4282dc1..9cdd9e206b 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -389,7 +389,7 @@ nm_dhcp_systemd_get_lease_ip_configs (const char *iface, return NULL; path = get_leasefile_path (iface, uuid, FALSE); - r = sd_dhcp_lease_load (path, &lease); + r = sd_dhcp_lease_load (&lease, path); if (r == 0) { ip4_config = lease_to_ip4_config (lease, NULL, 0, FALSE, NULL); if (ip4_config) @@ -457,7 +457,7 @@ bound4_handle (NMDhcpSystemd *self) add_requests_to_options (options, dhcp4_requests); 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) _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; } - sd_dhcp_lease_load (priv->lease_file, &lease); + sd_dhcp_lease_load (&lease, priv->lease_file); if (last_ip4_address) inet_pton (AF_INET, last_ip4_address, &last_addr); |