diff options
| author | Michael Biebl <biebl@debian.org> | 2018-02-07 02:39:23 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-02-07 02:39:23 +0100 |
| commit | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (patch) | |
| tree | b4bd771d78ebe38661b8c4ec8b9a8e0eb8261eb5 /src/dhcp/nm-dhcp-systemd.c | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
New upstream version 1.10.4 upstream/1.10.4
Diffstat (limited to 'src/dhcp/nm-dhcp-systemd.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-systemd.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 9b1a4433..f79b7cb1 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -489,19 +489,13 @@ _save_client_id (NMDhcpSystemd *self, const uint8_t *client_id, size_t len) { - gs_unref_bytes GBytes *b = NULL; - gs_free char *buf = NULL; - g_return_if_fail (self != NULL); g_return_if_fail (client_id != NULL); g_return_if_fail (len > 0); if (!nm_dhcp_client_get_client_id (NM_DHCP_CLIENT (self))) { - buf = g_malloc (len + 1); - buf[0] = type; - memcpy (buf + 1, client_id, len); - b = g_bytes_new (buf, len + 1); - nm_dhcp_client_set_client_id (NM_DHCP_CLIENT (self), b); + nm_dhcp_client_set_client_id_bin (NM_DHCP_CLIENT (self), + type, client_id, len); } } @@ -543,7 +537,7 @@ bound4_handle (NMDhcpSystemd *self) add_requests_to_options (options, dhcp4_requests); dhcp_lease_save (lease, priv->lease_file); - sd_dhcp_client_get_client_id(priv->client4, &type, &client_id, &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); @@ -691,14 +685,14 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last override_client_id = nm_dhcp_client_get_client_id (client); if (override_client_id) { client_id = g_bytes_get_data (override_client_id, &client_id_len); - g_assert (client_id && client_id_len); + nm_assert (client_id && client_id_len >= 2); sd_dhcp_client_set_client_id (priv->client4, client_id[0], client_id + 1, - client_id_len - 1); + NM_MIN (client_id_len - 1, _NM_SD_MAX_CLIENT_ID_LEN)); } else if (lease) { r = sd_dhcp_lease_get_client_id (lease, (const void **) &client_id, &client_id_len); - if (r == 0 && client_id_len) { + if (r == 0 && client_id_len >= 2) { sd_dhcp_client_set_client_id (priv->client4, client_id[0], client_id + 1, |