vhost.m4: Add transports to the live filter routers.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index e779a1a..7b2ea1e 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -59,11 +59,12 @@ gecos_pattern = ([^,:]*)
 
 SECTION(global, incoming)m4_dnl
 received_header_text = Received: \
-       ${if def:sender_rcvhost {from $sender_rcvhost\n\t} \
-            {${if def:sender_ident \
-                  {from ${quote_local_part:$sender_ident} }}\
+       ${if def:sender_rcvhost \
+            {from $sender_rcvhost\
              ${if def:sender_helo_name \
-                  {(helo=$sender_helo_name)\n\t}}}}\
+                  { (helo=$sender_helo_name)}}\n\t} \
+            {${if def:sender_ident \
+                  {from ${quote_local_part:$sender_ident} }}}}\
        by $primary_hostname \
        (Exim $version_number)\
        ${if def:tls_cipher {\n\t} { }}\
@@ -241,7 +242,8 @@ m4_define(<:FILTER_VERIFY:>,
 
 ## Transports for redirection filters.
 m4_define(<:FILTER_TRANSPORTS:>,
-       <:file_transport = mailbox
+       <:verify = false
+       file_transport = mailbox
        directory_transport = maildir
        pipe_transport = pipe
        reply_transport = reply:>)