diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-06 11:54:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-07 07:41:04 -0300 |
| commit | 9674b93f9d6fbe25e10330a6f807e5b7196c01b0 (patch) | |
| tree | 90a90d1f1cbc2eed6c1c1e07fe4649e97ea14d8f | |
| parent | c84b997124ea08338363c7b2b95747e30bf9e498 (diff) | |
Reject sender if it's not the logged in user
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/mail/conductor.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index a91f4e71..91bbe9cb 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -915,7 +915,6 @@ class MainWindow(QtGui.QMainWindow): user = self._logged_user domain = self._provider_config.get_domain() userid = "%s@%s" % (user, domain) - logger.debug("USERID: " % userid) self._mail_conductor.userid = userid self._login_defer = None self._start_eip_bootstrap() diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py index 4d34a13b..6dcf0c6f 100644 --- a/src/leap/bitmask/services/mail/conductor.py +++ b/src/leap/bitmask/services/mail/conductor.py @@ -200,6 +200,7 @@ class SMTPControl(object): from leap.mail.smtp import setup_smtp_relay self._smtp_service, self._smtp_port = setup_smtp_relay( port=2013, + userid=self.userid, keymanager=self._keymanager, smtp_host=host, smtp_port=port, @@ -345,7 +346,7 @@ class MailConductor(IMAPControl, SMTPControl): return self._userid @userid.setter - def _userid(self, userid): + def userid(self, userid): """ Sets the user id this conductor is configured for. |