diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-05 03:46:36 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-05 03:46:36 +0200 |
| commit | bb01912dd4dfe05f16d1c2fa716346ca358f5d04 (patch) | |
| tree | b3a910bcb586f3af964afaa5e61f75a4701df11f | |
| parent | d2d13cf61adf51895d45556ab0b08115ea2eeb1c (diff) | |
| parent | dbb8b11eab30d495492bd7f65430fb9c25e3a276 (diff) | |
Merge remote-tracking branch 'chiiph/feature/re-integrate-smtp' into develop
| -rw-r--r-- | changes/feature_reintegrate_smtp | 1 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 6 | ||||
| -rw-r--r-- | src/leap/services/__init__.py | 2 | ||||
| -rw-r--r-- | src/leap/services/soledad/soledadbootstrapper.py | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/changes/feature_reintegrate_smtp b/changes/feature_reintegrate_smtp new file mode 100644 index 00000000..3466dc57 --- /dev/null +++ b/changes/feature_reintegrate_smtp @@ -0,0 +1 @@ + o Reintegrate SMTP relay module. Closes #3375
\ No newline at end of file diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 395b9329..8e7e2488 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -982,12 +982,14 @@ class MainWindow(QtGui.QMainWindow): # TODO: Make the encrypted_only configurable from leap.mail.smtp import setup_smtp_relay + client_cert = self._eip_config.get_client_cert_path( + self._provider_config) setup_smtp_relay(port=1234, keymanager=self._keymanager, smtp_host=host, smtp_port=port, - smtp_username=".", - smtp_password=".", + smtp_cert=client_cert, + smtp_key=client_cert, encrypted_only=False) def _get_socket_host(self): diff --git a/src/leap/services/__init__.py b/src/leap/services/__init__.py index fc4aa416..253359cd 100644 --- a/src/leap/services/__init__.py +++ b/src/leap/services/__init__.py @@ -17,7 +17,7 @@ """ Services module. """ -DEPLOYED = ["openvpn"] # for 0.2.2 release +DEPLOYED = ["openvpn", "mx"] def get_supported(services): diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/services/soledad/soledadbootstrapper.py index 6f0c88b4..a952fac5 100644 --- a/src/leap/services/soledad/soledadbootstrapper.py +++ b/src/leap/services/soledad/soledadbootstrapper.py @@ -188,7 +188,7 @@ class SoledadBootstrapper(AbstractBootstrapper): srp_auth = SRPAuth(self._provider_config) self._keymanager = KeyManager( address, - "https://%s:6425" % (self._provider_config.get_domain()), + "https://nicknym.%s:6425" % (self._provider_config.get_domain(),), self._soledad, #token=srp_auth.get_token(), # TODO: enable token usage session_id=srp_auth.get_session_id(), |