diff options
| author | kali <kali@leap.se> | 2017-09-29 08:29:57 -0700 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-09-29 17:46:24 +0200 |
| commit | d45338761e3e6774809fd827060928876aa6696c (patch) | |
| tree | f936a930673ed6c4a6c30869ce00341c8b6dfcdb | |
| parent | 0f3ee7cfa34546ec5636e1d13a9884e7dce8997a (diff) | |
[bug] fixes needed to launch vpn on mac after refactor
| -rw-r--r-- | src/leap/bitmask/vpn/launcher.py | 5 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/launchers/darwin.py | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/leap/bitmask/vpn/launcher.py b/src/leap/bitmask/vpn/launcher.py index 6dd01596..e14be165 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 ed1c034c..08772dca 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() |