From 8646cf310a34828920f9cbf36c1f4c3da3cb6f9d Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Mon, 15 Apr 2013 19:35:47 +0000 Subject: Fix logic for return of Postfix TCP map responses in alias_resolver.StatusCodes --- src/leap/mx/alias_resolver.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/leap/mx/alias_resolver.py b/src/leap/mx/alias_resolver.py index 4fc20f5..48e7a85 100644 --- a/src/leap/mx/alias_resolver.py +++ b/src/leap/mx/alias_resolver.py @@ -146,11 +146,15 @@ class StatusCodes(object): """ if status_code: if isinstance(status_code, str): - return status_code, getattr(self, status_code.upper(), None) + if status_code.upper() in self.SMTPStrings.keys(): + return self.SMTPStrings[status_code], getattr( + self, status_code.upper(), '') + else: + return 500, self.FAIL elif isinstance(status_code, int): - for k, v in self.fake_smtp_codes.items(): - ## we want to return None if it's 550 - if k == str(status_code) and k != '550': + for k, v in self.SMTPCodes.items(): + ## we want to return None if it's 500 + if k == str(status_code) and k != '500': return status_code, v log.debug("%s" % self.NOKEY) return None, '' -- cgit v1.2.3