summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-06-22 08:06:20 -0700
committerKali Kaneko (leap communications) <kali@leap.se>2017-06-23 19:35:57 +0200
commit0067d8dba415d18759b170fa01a93f011e59474e (patch)
tree87c9f6b89023e6320345e5f697f5f94389964374 /src
parent867ad9fde2dfa82b478b3ba2070b982b17b28c91 (diff)
[bug] trim whitespace from options string
this was producing a bug with parsing options in a recent enough openvpn. - Resolves: #8945
Diffstat (limited to 'src')
-rwxr-xr-xsrc/leap/bitmask/vpn/helpers/osx/bitmask-helper8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper
index 32201aab..f8d90b81 100755
--- a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper
+++ b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper
@@ -167,7 +167,7 @@ def recv_until_marker(sock):
total_data[-2] = last_pair[:last_pair.find(end)]
total_data.pop()
break
- return ''.join(total_data)
+ return ''.join(total_data).strip()
def handle_command(sock):
@@ -256,10 +256,10 @@ def openvpn_start(*args):
# XXX DEBUG -------------------------------------------------
# try:
- # result = subprocess.check_output(
- # cmd, shell=False, stderr=subprocess.STDOUT)
+ # result = subprocess.check_output(
+ # cmd, shell=False, stderr=subprocess.STDOUT)
# except Exception as exc:
- # syslog.syslog(syslog.LOG_WARNING, exc.output)
+ # syslog.syslog(syslog.LOG_WARNING, exc.output)
def openvpn_stop(sig='TERM'):