summaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-10-27 18:24:19 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2017-10-27 20:31:01 +0200
commit6d21711445d3d6d173159e386258dc241de76578 (patch)
treed8dcabbdf5f2b4e3263c793ff551ab35cee8ee8f /src/devices
parent88c24ffc6aa8484310505726fd7e3010ef9c7c45 (diff)
downloadNetworkManager-6d21711445d3d6d173159e386258dc241de76578.tar.gz
device: add proxy setting to generated connections
Add a proxy setting to generated connections because after commit 6f94b1650764 ("libnm: fix nm_connection_diff() for settings without properties") the matching between a connection having the setting and another connection without it fails. Before the commit, since no proxy property is marked as inferrable, such comparison succeeded.
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/nm-device.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 0ea45d5e5a..fefa23ec01 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -4384,6 +4384,8 @@ nm_device_generate_connection (NMDevice *self,
s_ip6 = nm_ip6_config_create_setting (priv->ip6_config);
nm_connection_add_setting (connection, s_ip6);
+ nm_connection_add_setting (connection, nm_setting_proxy_new ());
+
pllink = nm_platform_link_get (nm_device_get_platform (self), priv->ifindex);
if (pllink && pllink->inet6_token.id) {
g_object_set (s_ip6,