summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/mail
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-19 15:50:43 -0400
committerKali Kaneko <kali@leap.se>2013-09-19 15:50:43 -0400
commit1c194fe4b5d7b43097c31331cc8a7162bfbef4be (patch)
treedd2f1e7901993208a00055e1f31595849d41eb51 /src/leap/bitmask/services/mail
parent006f362af526e9283c698805100e54c18b2be390 (diff)
parent6cd19c3b67d76268bab5f93d3168164ec02f603d (diff)
Merge remote-tracking branch 'ivan-github/feature/standalone-flag-to-module' into develop
Diffstat (limited to 'src/leap/bitmask/services/mail')
-rw-r--r--src/leap/bitmask/services/mail/smtpconfig.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/leap/bitmask/services/mail/smtpconfig.py b/src/leap/bitmask/services/mail/smtpconfig.py
index 74c9bc94..09f90314 100644
--- a/src/leap/bitmask/services/mail/smtpconfig.py
+++ b/src/leap/bitmask/services/mail/smtpconfig.py
@@ -23,6 +23,7 @@ import os
from leap.bitmask.config.providerconfig import ProviderConfig
from leap.bitmask.services import ServiceConfig
from leap.bitmask.services.mail.smtpspec import get_schema
+from leap.bitmask.util import get_path_prefix
from leap.common.check import leap_assert, leap_assert_type
logger = logging.getLogger(__name__)
@@ -61,13 +62,10 @@ class SMTPConfig(ServiceConfig):
leap_assert(providerconfig, "We need a provider")
leap_assert_type(providerconfig, ProviderConfig)
- cert_path = os.path.join(self.get_path_prefix(),
- "leap",
- "providers",
+ cert_path = os.path.join(get_path_prefix(),
+ "leap", "providers",
providerconfig.get_domain(),
- "keys",
- "client",
- "smtp.pem")
+ "keys", "client", "smtp.pem")
if not about_to_download:
leap_assert(os.path.exists(cert_path),