NetworkManager r3956 - in trunk/vpn-daemons/openvpn: . auth-dialog src

[tambeti svn gnome org]

Author: tambeti
Date: Thu Aug 14 10:24:30 2008
New Revision: 3956
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3956&view=rev

Log:
2008-08-14  Tambet Ingo  <tambet gmail com>

	* src/nm-openvpn-service.c (nm_openvpn_socket_data_cb): Detect private key
	verification errors too.

	* auth-dialog/main.c (pem_is_encrypted): GIOChannel isn't a GObject, use the
	correct unreferencing function for it.


Modified:
   trunk/vpn-daemons/openvpn/ChangeLog
   trunk/vpn-daemons/openvpn/auth-dialog/main.c
   trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c

Modified: trunk/vpn-daemons/openvpn/auth-dialog/main.c
==============================================================================
--- trunk/vpn-daemons/openvpn/auth-dialog/main.c	(original)
+++ trunk/vpn-daemons/openvpn/auth-dialog/main.c	Thu Aug 14 10:24:30 2008
@@ -160,7 +160,7 @@
 	}
 
 	g_io_channel_shutdown (pem_chan, FALSE, NULL);
-	g_object_unref (pem_chan);
+	g_io_channel_unref (pem_chan);
 	return encrypted;
 }
 

Modified: trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c
==============================================================================
--- trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c	(original)
+++ trunk/vpn-daemons/openvpn/src/nm-openvpn-service.c	Thu Aug 14 10:24:30 2008
@@ -323,6 +323,11 @@
 		nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED);
 		nm_openvpn_disconnect_management_socket (plugin);
 		again = FALSE;
+	} else if (strstr (str, "private key password verification failed")) {
+		nm_warning ("Private key verification failed");
+		nm_vpn_plugin_failure (NM_VPN_PLUGIN (plugin), NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED);
+		nm_openvpn_disconnect_management_socket (plugin);
+		again = FALSE;
 	}
 
  out: