diff options
| author | elijah <elijah@riseup.net> | 2016-04-14 12:39:26 -0700 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-15 15:17:58 -0400 |
| commit | 8361cfdf5f6f56da8e1f7297092d1458a72f9444 (patch) | |
| tree | 88e6a6fb97cba1c9881407d8b98b0bc49d093d59 | |
| parent | 32b01d729ea8c0e6ecd1bd1def909fc41156d405 (diff) | |
[bug] eip_can_start should return false if provider does not support eip
otherwise, it tries to open eip config.
- Resolves: #7538
- Releases: 0.9.2
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index bc34c84c..03a92c88 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -44,7 +44,7 @@ from leap.bitmask.platform_init import IS_LINUX from leap.bitmask import pix from leap.bitmask.provider.pinned import PinnedProviders from leap.bitmask.provider.providerbootstrapper import ProviderBootstrapper -from leap.bitmask.services import get_supported +from leap.bitmask.services import get_supported, EIP_SERVICE from leap.bitmask.services.eip import eipconfig from leap.bitmask.services.eip import get_openvpn_management from leap.bitmask.services.eip.eipbootstrapper import EIPBootstrapper @@ -651,8 +651,10 @@ class EIP(object): logger.error("No polkit agent running.") return False - eip_config = eipconfig.EIPConfig() provider_config = ProviderConfig.get_provider_config(domain) + if EIP_SERVICE not in provider_config.get_services(): + return False + eip_config = eipconfig.EIPConfig() api_version = provider_config.get_api_version() eip_config.set_api_version(api_version) |