diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-03-15 19:24:51 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-03-20 15:24:38 +0100 |
| commit | 1d88f50443125170b2ed11287e3857126975e1ae (patch) | |
| tree | b2b2db57b39663ac9a9837bcb5c82803bf49267a /src/devices/nm-device.c | |
| parent | 5fd82a20358dccec7f03f00df22237d1b7d2eb96 (diff) | |
| download | NetworkManager-1d88f50443125170b2ed11287e3857126975e1ae.tar.gz | |
device: also export NMIPxConfig on error in nm_device_set_ipx_config()
A failure to configure an address family does not mean that the connection
is going to fail. It depends, for example on ipvx.may-fail.
Always export the NMIPxConfig instance in that case.
Diffstat (limited to 'src/devices/nm-device.c')
| -rw-r--r-- | src/devices/nm-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5a8f0bfd15..9772c26791 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -10550,7 +10550,7 @@ nm_device_set_ip4_config (NMDevice *self, has_changes = TRUE; priv->ip4_config = g_object_ref (new_config); - if (success && !nm_dbus_object_is_exported (NM_DBUS_OBJECT (new_config))) + if (!nm_dbus_object_is_exported (NM_DBUS_OBJECT (new_config))) nm_dbus_object_export (NM_DBUS_OBJECT (new_config)); _LOGD (LOGD_IP4, "ip4-config: set IP4Config instance (%s)", @@ -10723,7 +10723,7 @@ nm_device_set_ip6_config (NMDevice *self, has_changes = TRUE; priv->ip6_config = g_object_ref (new_config); - if (success && !nm_dbus_object_is_exported (NM_DBUS_OBJECT (new_config))) + if (!nm_dbus_object_is_exported (NM_DBUS_OBJECT (new_config))) nm_dbus_object_export (NM_DBUS_OBJECT (new_config)); _LOGD (LOGD_IP6, "ip6-config: set IP6Config instance (%s)", |