diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-23 02:12:00 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-23 02:12:00 -0400 |
| commit | 3a43b79e0982dd5926a2e8ceb3f9d44415abb8ba (patch) | |
| tree | bc6888175028b44ac759e0cfc811bec5b9cc2881 /src/leap/mail/smtp/gateway.py | |
| parent | bd93b18b3e55ca5b3b4c4a00edb427ae60dc7f16 (diff) | |
| parent | 20c4a5c369ca7e5e169c17791eeb74756b23fd56 (diff) | |
Merge branch 'develop' into debian
Prepare for 0.3.8-rc
Diffstat (limited to 'src/leap/mail/smtp/gateway.py')
| -rw-r--r-- | src/leap/mail/smtp/gateway.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py index a78bd55..bef5c6d 100644 --- a/src/leap/mail/smtp/gateway.py +++ b/src/leap/mail/smtp/gateway.py @@ -52,6 +52,7 @@ from leap.common.events import proto, signal from leap.keymanager import KeyManager from leap.keymanager.openpgp import OpenPGPKey from leap.keymanager.errors import KeyNotFound +from leap.mail import __version__ from leap.mail.smtp.rfc3156 import ( MultipartSigned, MultipartEncrypted, @@ -492,7 +493,7 @@ class EncryptedMessage(object): heloFallback=True, requireAuthentication=False, requireTransportSecurity=True) - factory.domain = LOCAL_FQDN + factory.domain = __version__ signal(proto.SMTP_SEND_MESSAGE_START, self._user.dest.addrstr) reactor.connectSSL( self._host, self._port, factory, @@ -603,7 +604,7 @@ class EncryptedMessage(object): from_address = validate_address(self._fromAddress.addrstr) username, domain = from_address.split('@') self.lines.append('--') - self.lines.append('%s - https://%s/key/%s.' % + self.lines.append('%s - https://%s/key/%s' % (self.FOOTER_STRING, domain, username)) self.lines.append('') self._origmsg = self.parseMessage() |