diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2013-09-26 10:19:33 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2013-09-27 13:26:09 +0200 |
| commit | 9dff830692c8ff0fe69291e4bc882e4060d77542 (patch) | |
| tree | 9e21aa8d54b24b6efd1ec5e640e6ba314cfe2474 /include | |
| parent | f9bb4bb2ca122d0e6f091a23ebad68dcdac52ca6 (diff) | |
| download | NetworkManager-9dff830692c8ff0fe69291e4bc882e4060d77542.tar.gz | |
vpn: fix connecting to VPN (bgo #708255)
The ConnectInteractive() -> Connect() fallback code doesn't work, because
_connect_internal() changes the state to NM_VPN_SERVICE_STATE_STARTING before
checking if it can implement ConnectInteractive(), and then when the Connect()
call comes in, the VPN is not in STOPPED or INIT, so it returns an error.
The commit moves setting state to STARTING after the ConnectInteractive() check
availability, in the plugin. We introduce new plugin error and set it when the
the plugin does not implement ConnectInteractive(). NetworkManager uses this
error for ConnectInteractive() -> Connect() fallback.
https://bugzilla.gnome.org/show_bug.cgi?id=708255
Diffstat (limited to 'include')
| -rw-r--r-- | include/NetworkManagerVPN.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/NetworkManagerVPN.h b/include/NetworkManagerVPN.h index 6e654b3a7a..c5e6d3a456 100644 --- a/include/NetworkManagerVPN.h +++ b/include/NetworkManagerVPN.h @@ -47,6 +47,7 @@ #define NM_DBUS_VPN_ALREADY_STOPPED "AlreadyStopped" #define NM_DBUS_VPN_WRONG_STATE "WrongState" #define NM_DBUS_VPN_BAD_ARGUMENTS "BadArguments" +#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported" /* |