fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 04:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

vpn: Propagate daemon exec error correctly

Browse source 
NetworkManager[31624]: <warn>  VPN service 'openvpn': could not launch the VPN service. error: (8) Failed to execute child process "/usr/local/libexec/nm-openvpn-service" (No such file or directory).
**
NetworkManager:ERROR:nm-manager.c:3094:_activation_auth_done: assertion failed: (error)
This commit is contained in:
Lubomir Rintel 2014-11-09 12:38:38 +01:00
parent 51974196f9
commit 282d9b0e10
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vpn-manager/nm-vpn-service.c
View file

@ -54,7 +54,7 @@ typedef struct {
#define VPN_CONNECTION_GROUP "VPN Connection"
static gboolean start_pending_vpn (NMVpnService *self);
static gboolean start_pending_vpn (NMVpnService *self, GError **error);
NMVpnService *
nm_vpn_service_new (const char *namefile, GError **error)
@ -130,7 +130,7 @@ connection_vpn_state_changed (NMVpnConnection *connection,
g_signal_handlers_disconnect_by_func (connection, G_CALLBACK (connection_vpn_state_changed), self);
if (connection == priv->active) {
priv->active = NULL;
start_pending_vpn (self);
start_pending_vpn (self, NULL);
} else
priv->pending = g_slist_remove (priv->pending, connection);
g_object_unref (connection);
@ -253,7 +253,7 @@ start_active_vpn (NMVpnService *self, GError **error)
}
static gboolean
start_pending_vpn (NMVpnService *self)
start_pending_vpn (NMVpnService *self, GError **error)
{
NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self);
@ -266,7 +266,7 @@ start_pending_vpn (NMVpnService *self)
priv->active = g_slist_nth_data (priv->pending, 0);
priv->pending = g_slist_remove (priv->pending, priv->active);
return start_active_vpn (self, NULL);
return start_active_vpn (self, error);
}
gboolean
@ -300,7 +300,7 @@ nm_vpn_service_activate (NMVpnService *service,
}
/* Otherwise start the next VPN */
return start_pending_vpn (service);
return start_pending_vpn (service, error);
}
static void