NetworkManager r3713 - in trunk/vpn-daemons/openvpn: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri May 30 18:01:59 2008
New Revision: 3713
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3713&view=rev

Log:
2008-05-30  Dan Williams  <dcbw redhat com>

	Patch from Casey Harkins <caseyharkins gmail com>

	* src/nm-openvpn-service.c
		- (nm_openvpn_start_openvpn_binary): don't send 
--ns-cert-type, it's
			not really supposed to be used anymore since 
that option isn't
			used any more when creating server certificates



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

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	Fri May 30 18:01:59 2008
@@ -474,8 +474,6 @@
 	switch (connection_type) {
 	case NM_OPENVPN_CONTYPE_X509:
 		g_ptr_array_add (openvpn_argv, (gpointer) "--client");
-		g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
-		g_ptr_array_add (openvpn_argv, (gpointer) "server");
 
 		tmp = g_hash_table_lookup (properties, NM_OPENVPN_KEY_CA);
 		if (tmp) {
@@ -525,8 +523,6 @@
 	case NM_OPENVPN_CONTYPE_PASSWORD:
 		/* Client mode */
 		g_ptr_array_add (openvpn_argv, (gpointer) "--client");
-		g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
-		g_ptr_array_add (openvpn_argv, (gpointer) "server");
 		/* Use user/path authentication */
 		g_ptr_array_add (openvpn_argv, (gpointer) "--auth-user-pass");
 
@@ -539,8 +535,6 @@
 
 	case NM_OPENVPN_CONTYPE_X509USERPASS:
 		g_ptr_array_add (openvpn_argv, (gpointer) "--client");
-		g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
-		g_ptr_array_add (openvpn_argv, (gpointer) "server");
 
 		tmp = g_hash_table_lookup (properties, NM_OPENVPN_KEY_CA);
 		if (tmp) {