From d9ba5b2f32d61371ce8f0617687e997eaa5988aa Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 23 Sep 2009 21:46:17 +0100 Subject: [PATCH] we'll just take valid mail at data time from other d.o hosts Signed-off-by: Stephen Gran --- modules/exim/templates/eximconf.erb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 87407319b..562caffda 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -926,19 +926,6 @@ acl_check_predata: #!!# ACL that is used after the DATA command check_message: -<%= -out='' -if nodeinfo['mailrelay'] - out=' - accept verify = certificate -' -end -out -%> - - require verify = header_syntax - message = Invalid syntax in the header - <%= out='' if nodeinfo['rtmaster'] @@ -974,6 +961,11 @@ out } message = Mail to this address needs to be PGP-signed + accept verify = certificate + + require verify = header_syntax + message = Invalid syntax in the header + # RFC 822 and 2822 say that headers must be ASCII. This kinda emulates # postfix's strict_7bit_headers option, but only checks a few common problem # headers, as there doesn't appear to be an easy way to check them all. -- 2.20.1