summaryrefslogtreecommitdiff
path: root/src/leap/services/eip/vpnlaunchers.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-21 10:38:48 -0300
committerkali <kali@leap.se>2013-03-21 23:01:51 +0900
commitbdc3e1b840c383f0d9236ad8d4df66633e87baf5 (patch)
treeea5d871f8d1ea7c6fbd0e113671472e5289f6d43 /src/leap/services/eip/vpnlaunchers.py
parent3ddf59c1c43b8e481eeb557869a60c2a1b5b6f48 (diff)
Fixes as per review
Diffstat (limited to 'src/leap/services/eip/vpnlaunchers.py')
-rw-r--r--src/leap/services/eip/vpnlaunchers.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index c58649b9..e6502813 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -165,10 +165,15 @@ class LinuxVPNLauncher(VPNLauncher):
leap_assert(socket_host, "We need a socket host!")
leap_assert(socket_port, "We need a socket port!")
+ kwargs = {}
+ if ProviderConfig.standalone:
+ kwargs['path_extension'] = os.path.join(
+ providerconfig.get_path_prefix(),
+ "..", "apps", "eip")
+
openvpn_possibilities = which(
self.OPENVPN_BIN,
- path_extension=os.path.join(providerconfig.get_path_prefix(),
- "..", "apps", "eip"))
+ **kwargs)
if len(openvpn_possibilities) == 0:
raise OpenVPNNotFoundException()
@@ -253,6 +258,9 @@ class LinuxVPNLauncher(VPNLauncher):
This is mainly used for setting LD_LIBRARY_PATH to the correct
path when distributing a standalone client
+ @param providerconfig: provider specific configuration
+ @type providerconfig: ProviderConfig
+
@rtype: dict
"""
leap_assert(providerconfig, "We need a provider config")