summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-10-30 10:59:31 -0200
committerKali Kaneko <kali@leap.se>2013-10-30 10:59:31 -0200
commitdb6d5e230aa557205b51a1c41988d4ccc52bae5f (patch)
treeb339dd8e3ec689b1b8169bce46018e297ed040cd
parent74714c305ca40e910e4776d7e3cea21925bc1eb4 (diff)
parenteecd4f4b1cfff41944d9fb002a56b8675fa05298 (diff)
Merge remote-tracking branch 'chiiph/bug/recipient_return_line' into develop
-rw-r--r--changes/bug_fix_ret_codes1
-rw-r--r--src/leap/mx/check_recipient_access.py8
2 files changed, 6 insertions, 3 deletions
diff --git a/changes/bug_fix_ret_codes b/changes/bug_fix_ret_codes
new file mode 100644
index 0000000..54778db
--- /dev/null
+++ b/changes/bug_fix_ret_codes
@@ -0,0 +1 @@
+ o Fix return codes for check recipient access. Fixes #3356. \ No newline at end of file
diff --git a/src/leap/mx/check_recipient_access.py b/src/leap/mx/check_recipient_access.py
index 0520c7c..b80ccfd 100644
--- a/src/leap/mx/check_recipient_access.py
+++ b/src/leap/mx/check_recipient_access.py
@@ -29,11 +29,13 @@ from leap.mx.alias_resolver import AliasResolverFactory
class LEAPPostFixTCPMapserverAccess(postfix.PostfixTCPMapServer):
def _cbGot(self, value):
+ # For more info, see:
+ # http://www.postfix.org/tcp_table.5.html
+ # http://www.postfix.org/access.5.html
if value is None:
- self.sendCode(500, postfix.quote("NOT FOUND SORRY"))
+ self.sendCode(500, postfix.quote("REJECT"))
else:
- # We do not send the value in this case
- self.sendCode(200)
+ self.sendCode(200, postfix.quote("OK"))
class CheckRecipientAccessFactory(AliasResolverFactory):