diff options
| author | drebs <drebs@leap.se> | 2015-04-15 12:48:34 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-04-16 11:53:13 -0300 |
| commit | 527d7d4a67f859a3315812b100b2c58fd0eeded6 (patch) | |
| tree | b51959b18ec0053f9ed448cec9bd8c1bc98eb607 /src/leap/mx/mail_receiver.py | |
| parent | 14ef3dcce18240b756415fefa2a56936f96a12e9 (diff) | |
[bug] return uuid as result of alias resolver
This fixes a bug introduced on b0ef529cc882a96903597fb5279919969fa286c3, when
the alias resolver was modified to return the user's address instead of the
uuid.
In order to fix this, I had to revert one of the changes made by the commit
above, which is to don't make use of reduced view for the uuid query. The
pgp public key query remains reduced, as implemented in the commit above.
We also refactor the code a bit to allow for log messages specific to each of
tcp map's sublasses.
Related: #6858.
Diffstat (limited to 'src/leap/mx/mail_receiver.py')
| -rw-r--r-- | src/leap/mx/mail_receiver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index 77909b0..f0b9c03 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -491,7 +491,7 @@ class MailReceiver(Service): log.msg("BUG: There was no uuid!") defer.returnValue(None) - pubkey = yield self._users_cdb.getPubKey(uuid) + pubkey = yield self._users_cdb.getPubkey(uuid) if pubkey is None or len(pubkey) == 0: log.msg("No public key, stopping the processing chain") bounce_reason = "Missing PubKey: There was a problem " \ |