summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2017-09-29 08:29:57 -0700
committerKali Kaneko <kali@leap.se>2017-09-29 17:46:24 +0200
commitd45338761e3e6774809fd827060928876aa6696c (patch)
treef936a930673ed6c4a6c30869ce00341c8b6dfcdb
parent0f3ee7cfa34546ec5636e1d13a9884e7dce8997a (diff)
[bug] fixes needed to launch vpn on mac after refactor
-rw-r--r--src/leap/bitmask/vpn/launcher.py5
-rw-r--r--src/leap/bitmask/vpn/launchers/darwin.py3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/leap/bitmask/vpn/launcher.py b/src/leap/bitmask/vpn/launcher.py
index 6dd0159..e14be16 100644
--- a/src/leap/bitmask/vpn/launcher.py
+++ b/src/leap/bitmask/vpn/launcher.py
@@ -186,5 +186,10 @@ class VPNLauncher(object):
'--key', vpnconfig.get_client_cert_path(providerconfig)
]
+ # TODO -- get platform specific launcher args
+ if IS_MAC:
+ args += [
+ '--script-security', '2']
+
command_and_args = [openvpn_path] + args
return command_and_args
diff --git a/src/leap/bitmask/vpn/launchers/darwin.py b/src/leap/bitmask/vpn/launchers/darwin.py
index ed1c034..08772dc 100644
--- a/src/leap/bitmask/vpn/launchers/darwin.py
+++ b/src/leap/bitmask/vpn/launchers/darwin.py
@@ -91,3 +91,6 @@ class DarwinVPNLauncher(VPNLauncher):
def kill_previous_openvpn():
pass
+
+ def terminate_or_kill(self, terminatefun, killfun, proc):
+ terminatefun()