diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-11-02 16:57:19 +0100 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-11-09 17:36:50 +0100 |
| commit | 4917838116176737fc9d6f355da295d8ba263f0d (patch) | |
| tree | 25c42174b2dc562ec2a272526658b3e8882eaa65 | |
| parent | 106e2228520ed612b7198e6f7392ec5f2c2f883d (diff) | |
| download | NetworkManager-jk/ipv6-shared-SIGTRAP-rh1277171.tar.gz | |
device: don't assert in linklocal6_complete() on 'shared' method (rh #1277171)jk/ipv6-shared-SIGTRAP-rh1277171
NetworkManager would have terminated when Glib debugging was on.
/etc/NetworkManager/NetworkManager.conf
[main]
debug=fatal-warnings
https://bugzilla.redhat.com/show_bug.cgi?id=1277171
| -rw-r--r-- | src/devices/nm-device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2676636ebb..a27fe53c94 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4493,8 +4493,10 @@ linklocal6_complete (NMDevice *self) } } else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) == 0) nm_device_activate_schedule_ip6_config_result (self); + else if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_SHARED) == 0) + _LOGD (LOGD_DEVICE, "linklocal6_complete: 'shared' method is not supported for IPv6"); else - g_return_if_fail (FALSE); + g_return_if_reached (); } static void |