diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-01 20:58:23 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-01 20:58:23 +0200 |
| commit | 429393567647935d9123e21fd27a7529d50255eb (patch) | |
| tree | b5a99bf0cbbe77fccd7fee81caf71915ccf9eb96 /src/dhcp/nm-dhcp-client.c | |
| parent | 069cb5c3a525ebcc19cc2927964258acaca87b13 (diff) | |
New upstream version 1.12.0 upstream/1.12.0
Diffstat (limited to 'src/dhcp/nm-dhcp-client.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-client.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index 390b7054..360bd367 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -513,7 +513,7 @@ nm_dhcp_client_start_ip4 (NMDhcpClient *self, } static GBytes * -get_duid (NMDhcpClient *self, gboolean global) +get_duid (NMDhcpClient *self) { return NULL; } @@ -521,7 +521,7 @@ get_duid (NMDhcpClient *self, gboolean global) gboolean nm_dhcp_client_start_ip6 (NMDhcpClient *self, GBytes *client_id, - NMDhcpDuidEnforce enforce_duid, + gboolean enforce_duid, const char *dhcp_anycast_addr, const struct in6_addr *ll_addr, const char *hostname, @@ -541,12 +541,9 @@ nm_dhcp_client_start_ip6 (NMDhcpClient *self, nm_assert (!priv->duid); nm_assert (client_id); - if (enforce_duid == NM_DHCP_DUID_ENFORCE_NEVER) - priv->duid = NM_DHCP_CLIENT_GET_CLASS (self)->get_duid (self, TRUE); - else if (enforce_duid == NM_DHCP_DUID_ENFORCE_LEASE_FALLBACK) - priv->duid = NM_DHCP_CLIENT_GET_CLASS (self)->get_duid (self, FALSE); + if (!enforce_duid) + priv->duid = NM_DHCP_CLIENT_GET_CLASS (self)->get_duid (self); - /* NM_DHCP_DUID_ENFORCE_ALWAYS and fallback */ if (!priv->duid) priv->duid = g_bytes_ref (client_id); |