base.m4: Remove <...> from envelope sender address in Received lines.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index e0d9979..467e82f 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -72,7 +72,7 @@ received_header_text = Received: \
             {with $received_protocol \
              ${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
        ${if def:sender_address \
-            {(envelope-from <$sender_address>\
+            {(envelope-from $sender_address\
              ${if def:authenticated_id \
                   {; auth=$authenticated_id}})\n\t}}\
        id $message_exim_id\
@@ -242,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:>)