summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-05-28 12:10:54 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-05-28 12:10:54 -0300
commitc4c6225f4b7950c6a83e5648157d7fd4eccd7d3e (patch)
treec05bd66b5a2fe874685bdb08b960c34682ad042e
parentc85b1d594225cb71d744f387ab82107c499da947 (diff)
parent8d5fba55ee399aa7cf0d6e000f806cce7279a1f5 (diff)
Merge remote-tracking branch 'chiiph/bug/fix_setting_userid' into develop
-rw-r--r--changes/bug_set_userid1
-rw-r--r--src/leap/bitmask/services/mail/smtpbootstrapper.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug_set_userid b/changes/bug_set_userid
new file mode 100644
index 00000000..050a8808
--- /dev/null
+++ b/changes/bug_set_userid
@@ -0,0 +1 @@
+- Properly set the userid for SMTP. \ No newline at end of file
diff --git a/src/leap/bitmask/services/mail/smtpbootstrapper.py b/src/leap/bitmask/services/mail/smtpbootstrapper.py
index 785fe404..3ef755e8 100644
--- a/src/leap/bitmask/services/mail/smtpbootstrapper.py
+++ b/src/leap/bitmask/services/mail/smtpbootstrapper.py
@@ -152,7 +152,7 @@ class SMTPBootstrapper(AbstractBootstrapper):
self._provider_config = ProviderConfig.get_provider_config(domain)
self._keymanager = keymanager
self._smtp_config = SMTPConfig()
- self._useid = userid
+ self._userid = userid
self._download_if_needed = download_if_needed
try: