summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2014-11-09 14:09:40 +0100
committerLubomir Rintel <lkundrak@v3.sk>2014-11-13 10:36:34 +0100
commit78443cddf8b53559957be9bd25acf3d99b71bb4b (patch)
treef1d923b6acaacba4108ea8950844edf5a11f7c27
parent9e7ebc21b733433bc7b65edb3cb3d9e9349507b5 (diff)
downloadNetworkManager-lr/openvpn.tar.gz
libnm: Don't expect VPN connections to attach to the devicelr/openvpn
-rw-r--r--libnm/nm-manager.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index fc558620c7..12c9682780 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -816,9 +816,12 @@ recheck_pending_activations (NMManager *self)
devices = nm_active_connection_get_devices (candidate);
if (devices->len == 0)
continue;
- device = devices->pdata[0];
- if (nm_device_get_active_connection (device) != candidate)
- continue;
+
+ if (!NM_IS_VPN_CONNECTION (candidate)) {
+ device = devices->pdata[0];
+ if (nm_device_get_active_connection (device) != candidate)
+ continue;
+ }
activate_info_complete (info, candidate, NULL);
break;