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
This commit is contained in:
Dan Williams 2008-11-14 15:23:08 +00:00
parent 543d9b995c
commit a2967685db
2 changed files with 12 additions and 4 deletions

View file

@ -1,3 +1,9 @@
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)
2008-11-13 Dan Williams <dcbw@redhat.com>
* libnm-util/crypto.c

View file

@ -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 *