diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-02-15 21:10:26 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-02-15 21:32:49 +0100 |
| commit | 8b2abe0e2c8f162544a2562fc18a7becbc55d233 (patch) | |
| tree | a2178f0ea1754a96abe035927d32ae6b7512427a | |
| parent | 7bb491c84eed07ad7b58802c4e3eafbe1105db3a (diff) | |
| download | NetworkManager-8b2abe0e2c8f162544a2562fc18a7becbc55d233.tar.gz | |
device: check avaliable connections are really available
The nm_device_check_connection_available() call seem to have been accidentally
removed from nm_device_recheck_available_connections() resulting in all
connections always being added.
Fixes 02ec76df5aaa3a3ad197cb1d53c0388029775b07
| -rw-r--r-- | src/devices/nm-device.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index ce7e72fca0..cbcb2c7271 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -9354,10 +9354,15 @@ nm_device_recheck_available_connections (NMDevice *self) for (iter = connections; iter; iter = g_slist_next (iter)) { connection = NM_CONNECTION (iter->data); - if (available_connections_add (self, connection)) { - if (prune_list) - g_hash_table_remove (prune_list, connection); - changed = TRUE; + if (nm_device_check_connection_available (self, + connection, + NM_DEVICE_CHECK_CON_AVAILABLE_NONE, + NULL)) { + if (available_connections_add (self, connection)) + changed = TRUE; + } else { + if (prune_list && g_hash_table_remove (prune_list, connection)) + changed = TRUE; } } |