diff options
| author | kali <kali@leap.se> | 2017-08-08 09:07:09 -0700 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-08-14 18:10:31 -0400 |
| commit | 6acf5ddfaf8e091f6b05b814128ac4f38b19c191 (patch) | |
| tree | 20a1fb8e7a1b6345434ea8901a3fd5120d5b9bbc /src/leap/bitmask/vpn/helpers/osx | |
| parent | b9f651fb98fd639697fafb23f669fd05588b4345 (diff) | |
[bug] proper vpn shutdown in osx bundles
the restarting flag was not being set.
- Resolves: #8959
Diffstat (limited to 'src/leap/bitmask/vpn/helpers/osx')
| -rwxr-xr-x | src/leap/bitmask/vpn/helpers/osx/bitmask-helper | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper index f8d90b81..4a54295b 100755 --- a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper +++ b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper @@ -251,6 +251,10 @@ def openvpn_start(*args): syslog.syslog(syslog.LOG_WARNING, 'LAUNCHING VPN: ' + ' '.join(cmd)) global openvpn_proc + if openvpn_proc is not None: + syslog.syslog(syslog.LOG_WARNING, 'vpn: another process is already started') + return + # TODO sanitize options openvpn_proc = subprocess.Popen(cmd, shell=False, bufsize=-1) @@ -270,6 +274,8 @@ def openvpn_stop(sig='TERM'): :type args: list """ global openvpn_proc + syslog.syslog( + syslog.LOG_WARNING, "Stopping OpenVPN...") if openvpn_proc: syslog.syslog( |