X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/e7b830e76c219fee0448df9b7de8428b957b0d67..37a602dbb7e06f825e56825576ffd8231008a693:/base.m4

diff --git a/base.m4 b/base.m4
index 7b2ea1e..f8b2901 100644
--- 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\
@@ -130,8 +130,8 @@ mail:
 		 add_header = :after_received:X-Distorted-Warning: \
 			BADHELO \
 			Client's HELO doesn't match its IP address.\n\t\
-			HELO name = $sender_helo_name, \
-			address = $sender_host_address
+			HELO name=$sender_helo_name, \
+			address=$sender_host_address
 
 	## Always allow the empty sender, so that we can receive bounces.
 	accept	 senders = :
@@ -242,12 +242,20 @@ m4_define(<:FILTER_VERIFY:>,
 
 ## Transports for redirection filters.
 m4_define(<:FILTER_TRANSPORTS:>,
-	<:verify = false
-	file_transport = mailbox
+	<:file_transport = mailbox
 	directory_transport = maildir
 	pipe_transport = pipe
 	reply_transport = reply:>)
 
+m4_define(<:FILTER_ROUTER:>,
+<:$1_vrf:
+	$2
+	FILTER_VERIFY<::>$3
+$1:
+	$2
+	verify = no
+	FILTER_TRANSPORTS<::>$4:>)
+
 DIVERT(null)
 ###--------------------------------------------------------------------------
 ### Some standard transports.