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

manager: merge branch 'bg/manager-vpn-fixes'

Browse source 
https://github.com/NetworkManager/NetworkManager/pull/99
This commit is contained in:
Beniamino Galvani 2018-04-20 16:26:46 +02:00
commit 7cea2398a6
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/nm-manager.c
View file

@ -4017,15 +4017,13 @@ _new_active_connection (NMManager *self,
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
NMSettingsConnection *settings_connection = NULL;
NMDevice *parent_device;
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), NULL);
nm_assert (is_vpn == _connection_is_vpn (connection));
nm_assert ( ( is_vpn && !device)
|| (!is_vpn && NM_IS_DEVICE (device)));
nm_assert (is_vpn || NM_IS_DEVICE (device));
nm_assert (!nm_streq0 (specific_object, "/"));
if (NM_IS_SETTINGS_CONNECTION (connection))
@ -4069,15 +4067,21 @@ _new_active_connection (NMManager *self,
return NULL;
}
device = nm_active_connection_get_device (parent);
if (!device) {
parent_device = nm_active_connection_get_device (parent);
if (!parent_device) {
g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"Source connection had no active device");
return NULL;
}
if (device && device != parent_device) {
g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"The device doesn't match the active connection.");
return NULL;
}
return (NMActiveConnection *) nm_vpn_connection_new (settings_connection,
device,
parent_device,
nm_dbus_object_get_path (NM_DBUS_OBJECT (parent)),
activation_reason,
subject);
@ -4215,7 +4219,7 @@ nm_manager_activate_connection (NMManager *self,
}
active = _new_active_connection (self,
FALSE,
_connection_is_vpn (NM_CONNECTION (connection)),
NM_CONNECTION (connection),
applied,
specific_object,