summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-15 12:01:45 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-15 12:01:45 -0300
commit1a105a07daa2c32243fb67bbacfc511d6014691e (patch)
treed3e02fa8430204cbea1f33190adec26d8ecbcc5c
parentb4e7e9475c9aeaa768bc7c023efe2e96f463fe9d (diff)
Detect a running instance of EIP by checking for LEAPOPENVPN var
-rw-r--r--src/leap/bitmask/services/eip/vpnprocess.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 95ea2334..a96f176e 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -579,7 +579,7 @@ class VPNManager(object):
# we need to be able to filter out arguments in the form
# --openvpn-foo, since otherwise we are shooting ourselves
# in the feet.
- if any(map(lambda s: s.startswith("openvpn"), p.cmdline)):
+ if any(map(lambda s: s.find("LEAPOPENVPN") != -1, p.cmdline)):
openvpn_process = p
break
except psutil.error.AccessDenied: