diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-15 15:59:32 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-15 16:12:14 +0100 |
| commit | 5923a30c43f9e79e368f7595d96c73797d24dd46 (patch) | |
| tree | 1c1e1e44a2aa5955f5199b1dd27467618805fa62 | |
| parent | c032690df227a609fc4b47c78269448576b6bda1 (diff) | |
| download | NetworkManager-5923a30c43f9e79e368f7595d96c73797d24dd46.tar.gz | |
settings/ifupdown: fix ifupdown plugin after merging eni_ifaces and connections hashes
The @eni_ifaces hash may now contain %NULL elements. They are only markers
for interface names, but are not actual connections.
They must be skipped.
Fixes: 6aa66426a4168b3db115646f410bcb5deea6847b
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/124
| -rw-r--r-- | src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c index 317de633a2..99a594776d 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c @@ -281,8 +281,10 @@ initialize (NMSettingsPlugin *plugin) g_hash_table_iter_init (&iter, priv->eni_ifaces); while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) { - _nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self), - NM_SETTINGS_CONNECTION (conn)); + if (conn) { + _nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self), + NM_SETTINGS_CONNECTION (conn)); + } } } } |