[network-manager-openvpn] core: send --ifconfig-noexec to prevent openvpn from messing up IP config (bgo #629807)

[Dan Williams <dcbw src gnome org>]

commit 9a280f7ae9fabbce7ee92fe736fad1c25f153c14
Author: Dan Williams <dcbw redhat com>
Date:   Fri Sep 17 15:59:41 2010 -0500

    core: send --ifconfig-noexec to prevent openvpn from messing up IP config (bgo #629807)
    
    Otherwise openvpn will execute /sbin/ip and set up tunnel information itself
    (which is sometimes wrong when the 'subnet' topology is used, see the bug)
    which interferes with NetworkManager.  NM tries to determine if the address its
    about to add to the interface is already on the interface, and doesn't add it
    if that this the case.  But when OpenVPN sets up the interface underneath NM
    this can make NM think the address is already applied, and NM does not apply
    the correct IP configuration to the interface.

 src/nm-openvpn-service.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 1b0452f..8ac0d26 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -957,8 +957,9 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
 	/* Query on the management socket for user/pass */
 	add_openvpn_arg (args, "--management-query-passwords");
 
-	/* do not let openvpn setup routes, NM will handle it */
+	/* do not let openvpn setup routes or addresses, NM will handle it */
 	add_openvpn_arg (args, "--route-noexec");
+	add_openvpn_arg (args, "--ifconfig-noexec");
 
 	/* Now append configuration options which are dependent on the configuration type */
 	if (!strcmp (connection_type, NM_OPENVPN_CONTYPE_TLS)) {