From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 5 May 2013 07:22:49 +0000 (+0200)
Subject: Leak a little bit of info about why a message is rejected
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=2093bc03536fb5421953fe9032e3aea76e8fe7ab

Leak a little bit of info about why a message is rejected

It's less confusing for users if we say something like "your DNS is
broken" rather than just "message rejected".
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 5c9f8bb28..fb0da2efa 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -837,6 +837,7 @@ check_recipient:
                         ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-callout}{$local_part}{}}
           !hosts   = +debianhosts : WHITELIST
 	  !verify  = sender/callout=90s,maxwait=300s
+	  message  = "Sender verification failed: $acl_verify_message"
 
 <%- end -%>
 <%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>