diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-19 17:50:53 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-20 15:08:40 -0300 |
| commit | 53bc81a863351cdf7bfb7a252bffdd8870e71742 (patch) | |
| tree | 3f4fcddb2767de468866b5299f38dc5bfbd62da7 /src/leap/mx/alias_resolver.py | |
| parent | 5ae019af6e29697dd43700c614e06298d719ff96 (diff) | |
Migrate mx to work with the new couchdb structure and views
Diffstat (limited to 'src/leap/mx/alias_resolver.py')
| -rw-r--r-- | src/leap/mx/alias_resolver.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/leap/mx/alias_resolver.py b/src/leap/mx/alias_resolver.py index 08ebb73..45a3ed2 100644 --- a/src/leap/mx/alias_resolver.py +++ b/src/leap/mx/alias_resolver.py @@ -80,16 +80,8 @@ class AliasResolverFactory(postfix.PostfixTCPMapDeferringDictServerFactory): At some point we will have to consider the domain part too. """ try: - log.msg("Processing key: %s" % (key,)) - if key.find("@") == -1: - # No proper email address, but we need to continue processing - # the query so postmap is happy. - log.msg("Key it's not an email address") - else: - key = key.split("@")[0] - key = key.split("+")[0] - log.msg("Final key to query: %s" % (key,)) - d = self._cdb.queryByLoginOrAlias(key) + log.msg("Query key: %s" % (key,)) + d = self._cdb.queryByAddress(key) d.addCallback(self._to_str) d.addCallback(self.spit_result) |