diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 12:20:27 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 12:20:27 +0200 |
| commit | 486e0bef719d78ee55d2166b0bfb4fa684c09854 (patch) | |
| tree | aead4c1cc30eb61a2d9dec70f7c8339904506fad /src/dhcp/nm-dhcp-dhclient.c | |
| parent | 39143df7aed46e83f8c68ea9ad6d24cfdf5a1dd8 (diff) | |
| parent | 10ae7d8cd706062742d0cdb1803d49909aef9e06 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src/dhcp/nm-dhcp-dhclient.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-dhclient.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 617ce236..4ad056e5 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -147,6 +147,7 @@ merge_dhclient_config (NMDhcpDhclient *self, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mud_url, const char *orig_path, GBytes **out_new_client_id, GError **error) @@ -176,6 +177,7 @@ merge_dhclient_config (NMDhcpDhclient *self, timeout, use_fqdn, hostname_flags, + mud_url, orig_path, orig, out_new_client_id); @@ -268,6 +270,7 @@ create_dhclient_config (NMDhcpDhclient *self, guint32 timeout, gboolean use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mud_url, GBytes **out_new_client_id) { gs_free char *orig = NULL; @@ -296,6 +299,7 @@ create_dhclient_config (NMDhcpDhclient *self, timeout, use_fqdn, hostname_flags, + mud_url, orig, out_new_client_id, &error)) { @@ -496,6 +500,7 @@ ip4_start (NMDhcpClient *client, nm_dhcp_client_get_timeout (client), nm_dhcp_client_get_use_fqdn (client), nm_dhcp_client_get_hostname_flags (client), + nm_dhcp_client_get_mud_url (client), &new_client_id); if (!priv->conf_file) { nm_utils_error_set_literal (error, @@ -540,6 +545,7 @@ ip6_start (NMDhcpClient *client, nm_dhcp_client_get_timeout (client), TRUE, nm_dhcp_client_get_hostname_flags (client), + nm_dhcp_client_get_mud_url (client), NULL); if (!priv->conf_file) { nm_utils_error_set_literal (error, |