fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 16:20:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: accept non-null device for VPN activations

Browse source 
Commit 10753c3616 ("manager: merge VPN handling into
_new_active_connection()") added a check to fail the activation of
VPNs when a device is passed to ActivateConnection(), since the device
argument is ignored for VPNs.

This broke activating VPNs from nm-applet as nm-applet sets both the
specific_object (parent-connection) and device arguments in the
activation request.

Note that we already check in _new_active_connection() that when a
device is supplied, it matches the device of the parent
connection. Therefore, the check can be dropped.

Reported-by: Michael Biebl <biebl@debian.org>
Fixes: 10753c3616

https://github.com/NetworkManager/NetworkManager/pull/159
(cherry picked from commit e205664ba8)
This commit is contained in:
Beniamino Galvani 2018-07-06 15:54:16 +02:00
parent ffcd74e9e4
commit 9748aef7c7
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nm-manager.c
View file

@ -4611,21 +4611,7 @@ validate_activation_request (NMManager *self,
}
}
if (is_vpn && device) {
/* VPN's are treated specially. Maybe the should accept a device as well,
* however, later on during activation, we don't handle the device.
*
* Maybe we should, and maybe it makes sense to specify a device
* when activating a VPN. But for now, just error out. */
g_set_error_literal (error,
NM_MANAGER_ERROR,
NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"Cannot specify device when activating VPN");
return NULL;
}
nm_assert ( ( is_vpn && !device)
|| (!is_vpn && NM_IS_DEVICE (device)));
nm_assert (is_vpn || NM_IS_DEVICE (device));
*out_device = device;
*out_is_vpn = is_vpn;