--- NetworkManager-openvpn-0.7.0.orig/src/nm-openvpn-service.c	2008-05-01 23:00:01.000000000 -0400
+++ NetworkManager-openvpn-0.7.0/src/nm-openvpn-service.c	2008-07-18 12:04:08.000000000 -0400
@@ -442,7 +442,7 @@
 		g_ptr_array_add (openvpn_argv, (gpointer) g_value_get_string ((GValue *) tmp));
 
 		tmp = g_hash_table_lookup (properties, NM_OPENVPN_KEY_TA_DIR);
-		if (tmp)
+		if (tmp && !g_str_equal((gconstpointer) g_value_get_string ((GValue *) tmp), ""))
 			g_ptr_array_add (openvpn_argv, (gpointer) g_value_get_string ((GValue *) tmp));
 	}
 
@@ -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) {