summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug_reject_bad_sender1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py1
-rw-r--r--src/leap/bitmask/services/mail/conductor.py3
3 files changed, 3 insertions, 2 deletions
diff --git a/changes/bug_reject_bad_sender b/changes/bug_reject_bad_sender
new file mode 100644
index 00000000..0a4f360f
--- /dev/null
+++ b/changes/bug_reject_bad_sender
@@ -0,0 +1 @@
+- Give SMTP the current logged in userid. Related to #3952. \ No newline at end of file
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.