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-manager.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-manager.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-manager.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c index 333744dd..7565bfc8 100644 --- a/src/dhcp/nm-dhcp-manager.c +++ b/src/dhcp/nm-dhcp-manager.c @@ -220,6 +220,7 @@ client_start (NMDhcpManager *self, const char *hostname, gboolean hostname_use_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mud_url, gboolean info_only, NMSettingIP6ConfigPrivacy privacy, const char *last_ip4_address, @@ -303,6 +304,7 @@ client_start (NMDhcpManager *self, NM_DHCP_CLIENT_IAID, (guint) iaid, NM_DHCP_CLIENT_IAID_EXPLICIT, iaid_explicit, NM_DHCP_CLIENT_HOSTNAME, hostname, + NM_DHCP_CLIENT_MUD_URL, mud_url, NM_DHCP_CLIENT_ROUTE_TABLE, (guint) route_table, NM_DHCP_CLIENT_ROUTE_METRIC, (guint) route_metric, NM_DHCP_CLIENT_TIMEOUT, (guint) timeout, @@ -382,6 +384,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, const char *dhcp_hostname, const char *dhcp_fqdn, NMDhcpHostnameFlags hostname_flags, + const char *mud_url, GBytes *dhcp_client_id, guint32 timeout, const char *dhcp_anycast_addr, @@ -440,6 +443,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, hostname, use_fqdn, hostname_flags, + mud_url, FALSE, 0, last_ip_address, @@ -462,6 +466,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, gboolean send_hostname, const char *dhcp_hostname, NMDhcpHostnameFlags hostname_flags, + const char *mud_url, GBytes *duid, gboolean enforce_duid, guint32 iaid, @@ -503,6 +508,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, hostname, TRUE, hostname_flags, + mud_url, info_only, privacy, NULL, |