colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: disable delegating prefixes to the device when the IPv6 config is removed

Browse Source 
Fixes a crash where the default DNS domain to be announced together with the
prefixes to be delegated is updated at the same time the device is being
unrealized.

https://bugzilla.redhat.com/show_bug.cgi?id=1425818
This commit is contained in:
Lubomir Rintel
2017-04-27 15:37:14 +02:00
parent d19553392b
commit 3e076cf8b1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/nm-device.c
View File

@@ -9895,6 +9895,7 @@ nm_device_set_ip6_config (NMDevice *self,
} else if (old_config) { } else if (old_config) {
has_changes = TRUE; has_changes = TRUE;
priv->ip6_config = NULL; priv->ip6_config = NULL;
priv->needs_ip6_subnet = FALSE;
_LOGD (LOGD_IP6, "ip6-config: clear IP6Config instance (%s)", _LOGD (LOGD_IP6, "ip6-config: clear IP6Config instance (%s)",
nm_exported_object_get_path (NM_EXPORTED_OBJECT (old_config))); nm_exported_object_get_path (NM_EXPORTED_OBJECT (old_config)));
} }
@@ -11956,7 +11957,9 @@ _cleanup_generic_post (NMDevice *self, CleanupType cleanup_type)
g_slist_free_full (priv->vpn6_configs, g_object_unref); g_slist_free_full (priv->vpn6_configs, g_object_unref);
priv->vpn6_configs = NULL; priv->vpn6_configs = NULL;
priv->needs_ip6_subnet = FALSE; /* We no longer accept the delegations. nm_device_set_ip6_config(NULL)
* above disables them. */
nm_assert (priv->needs_ip6_subnet == FALSE);
if (priv->act_request) { if (priv->act_request) {
nm_active_connection_set_default (NM_ACTIVE_CONNECTION (priv->act_request), FALSE); nm_active_connection_set_default (NM_ACTIVE_CONNECTION (priv->act_request), FALSE);