NetworkManager r4282 - in trunk: . src/vpn-manager

[dcbw svn gnome org]

Author: dcbw
Date: Fri Nov 14 15:23:08 2008
New Revision: 4282
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4282&view=rev

Log:
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)



Modified:
   trunk/ChangeLog
   trunk/src/vpn-manager/nm-vpn-connection.c

Modified: trunk/src/vpn-manager/nm-vpn-connection.c
==============================================================================
--- trunk/src/vpn-manager/nm-vpn-connection.c	(original)
+++ trunk/src/vpn-manager/nm-vpn-connection.c	Fri Nov 14 15:23:08 2008
@@ -284,7 +284,7 @@
 				  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 @@
 	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 @@
 	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 *