Merge branch 'release-0.3.8'

3 files changed, 23 insertions, 11 deletions

diff --git a/src/leap/bitmask/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py
index 16ed4cc0..09a3d257 100644
--- a/src/leap/bitmask/services/eip/eipconfig.py
+++ b/src/leap/bitmask/services/eip/eipconfig.py
@@ -33,17 +33,25 @@ from leap.common.check import leap_assert, leap_assert_type
 logger = logging.getLogger(__name__)
 
 
-def get_eipconfig_path(domain):
+def get_eipconfig_path(domain, relative=True):
     """
-    Returns relative path for EIP config.
+    Returns relative or absolute path for EIP config.
 
     :param domain: the domain to which this eipconfig belongs to.
     :type domain: str
+    :param relative: defines whether the path should be relative or absolute.
+    :type relative: bool
     :returns: the path
     :rtype: str
     """
     leap_assert(domain is not None, "get_eipconfig_path: We need a domain")
-    return os.path.join("leap", "providers", domain, "eip-service.json")
+
+    path = os.path.join("leap", "providers", domain, "eip-service.json")
+
+    if not relative:
+        path = os.path.join(get_path_prefix(), path)
+
+    return path
 
 
 def load_eipconfig_if_needed(provider_config, eip_config, domain):
diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
index d02f6f96..d24e7ae7 100644
--- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
@@ -77,7 +77,7 @@ def _try_to_launch_agent():
     Tries to launch a polkit daemon.
     """
     env = None
-    if flags.STANDALONE is True:
+    if flags.STANDALONE:
         env = {"PYTHONPATH": os.path.abspath('../../../../lib/')}
     try:
         # We need to quote the command because subprocess call
@@ -148,18 +148,21 @@ class LinuxVPNLauncher(VPNLauncher):
     def missing_other_files(kls):
         """
         'Extend' the VPNLauncher's missing_other_files to check if the polkit
-        files is outdated. If the polkit file that is in OTHER_FILES exists but
-        is not up to date, it is added to the missing list.
+        files is outdated, in the case of an standalone bundle.
+        If the polkit file that is in OTHER_FILES exists but is not up to date,
+        it is added to the missing list.
 
         :returns: a list of missing files
         :rtype: list of str
         """
         # we use `super` in order to send the class to use
         missing = super(LinuxVPNLauncher, kls).missing_other_files()
-        polkit_file = LinuxPolicyChecker.get_polkit_path()
-        if polkit_file not in missing:
-            if privilege_policies.is_policy_outdated(kls.OPENVPN_BIN_PATH):
-                missing.append(polkit_file)
+
+        if flags.STANDALONE:
+            polkit_file = LinuxPolicyChecker.get_polkit_path()
+            if polkit_file not in missing:
+                if privilege_policies.is_policy_outdated(kls.OPENVPN_BIN_PATH):
+                    missing.append(polkit_file)
 
         return missing
 
diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py
index 07497814..99cae7f9 100644
--- a/src/leap/bitmask/services/eip/vpnlauncher.py
+++ b/src/leap/bitmask/services/eip/vpnlauncher.py
@@ -147,7 +147,8 @@ class VPNLauncher(object):
         args = []
 
         args += [
-            '--setenv', "LEAPOPENVPN", "1"
+            '--setenv', "LEAPOPENVPN", "1",
+            '--nobind'
         ]
 
         if openvpn_verb is not None: