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

[dcbw svn gnome org]

Author: dcbw
Date: Fri Sep  5 17:18:41 2008
New Revision: 4041
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4041&view=rev

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

	* src/nm-openvpn-service.c
		- (nm_openvpn_start_openvpn_binary): send --script-security=2 to allow
			the plugin's scripts to be run.  Requires OpenVPN 2.1-rc9 or later,
			distros with older versions should patch this out.



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 Sep  5 17:18:41 2008
@@ -613,6 +613,13 @@
 	add_openvpn_arg (args, "--syslog");
 	add_openvpn_arg (args, "nm-openvpn");
 
+	/* Bash script security in the face; this option was added to OpenVPN 2.1-rc9
+	 * and defaults to disallowing any scripts, a behavior change from previous
+	 * versions.
+	 */
+	add_openvpn_arg (args, "--script-security");
+	add_openvpn_arg (args, "2");
+
 	/* Up script, called when connection has been established or has been restarted */
 	add_openvpn_arg (args, "--up");
 	add_openvpn_arg (args, NM_OPENVPN_HELPER_PATH);