summaryrefslogtreecommitdiff
path: root/src/vpn-manager
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2008-11-14 15:23:08 +0000
committerDan Williams <dcbw@redhat.com>2008-11-14 15:23:08 +0000
commita2967685dbc6da044f905a77d764120ecdcb70a9 (patch)
tree033bb71e28bce66f1bd61b0471e15e5dad4b9bfd /src/vpn-manager
parent543d9b995c1e420d50457d6b0a4aab21dcc9a8ad (diff)
2008-11-14 Dan Williams <dcbw@redhat.com>
* vpn-manager/nm-vpn-connection.c - (plugin_state_changed): clear VPN secrets on error to ensure they are always requested from the settings service (rh #429287) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4282 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/vpn-manager')
-rw-r--r--src/vpn-manager/nm-vpn-connection.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 8c0a7a9c0b..c29f48d1f9 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -284,7 +284,7 @@ plugin_state_changed (DBusGProxy *proxy,
gpointer user_data)
{
NMVPNConnection *connection = NM_VPN_CONNECTION (user_data);
- NMVPNConnectionPrivate *priv;
+ NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
nm_info ("VPN plugin state changed: %d", state);
@@ -297,9 +297,6 @@ plugin_state_changed (DBusGProxy *proxy,
case NM_VPN_CONNECTION_STATE_CONNECT:
case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
case NM_VPN_CONNECTION_STATE_ACTIVATED:
-
- priv = NM_VPN_CONNECTION_GET_PRIVATE (connection);
-
nm_info ("VPN plugin state change reason: %d", priv->failure_reason);
nm_vpn_connection_set_vpn_state (connection,
NM_VPN_CONNECTION_STATE_FAILED,
@@ -311,6 +308,11 @@ plugin_state_changed (DBusGProxy *proxy,
default:
break;
}
+
+ /* Clear connection secrets too so the auth dialogs get asked
+ * for them next time.
+ */
+ nm_connection_clear_secrets (priv->connection);
}
static const char *