X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/9a361f76d90e0b0bf1b553c5b07f2e7ebbd92fa9..af4b4ca8bcc6a4b1de9a2472b84c4de5127138ce:/exchange.m4

diff --git a/exchange.m4 b/exchange.m4
index fe79ce3..cf2a81b 100644
--- a/exchange.m4
+++ b/exchange.m4
@@ -52,12 +52,11 @@ mail_client_addr:
 			   {${if match_domain {$sender_address_domain} \
 					      {+public} \
 				 {+allnets}{! +allnets}}})}
-		 ADD_HEADER(<:X-CONF_header_token-Warning: \
-			RCLNTLSNDR \
-			Apparently local sender, but received from remote \
-			server.\n\t\
-			sender=$sender_address \
-			host=$sender_host_address:>)
+		  WARNING_HEADER(RCLNTLSNDR,
+				 <:Apparently local sender, but received from remote \
+				   server.\n\t\
+				   sender=$sender_address \
+				   host=$sender_host_address:>)
 
 	## OK.
 	accept
@@ -67,8 +66,7 @@ DIVERT(null)
 ### Rename locally-meaningful headers in mail from outside.
 
 m4_define(<:DISTORTED_HEADERS:>,
-<:X-CONF_header_token-Warning,
-X-CONF_header_token-SpamAssassin-Score,
+<:X-CONF_header_token-SpamAssassin-Score,
 X-CONF_header_token-SpamAssassin-Status:>)
 
 SECTION(acl, data)m4_dnl
@@ -98,6 +96,8 @@ local:
 			   CONF_master_domain : \
 			   *.CONF_master_domain }}
 	self = fail
+	same_domain_copy_routing = yes
+	ignore_target_hosts = +bogus
 	transport = smtp_local
 	no_more
 
@@ -109,6 +109,8 @@ remote:
 			       {false})}} \
 		       {}{ ! +public }}
 	self = fail
+	same_domain_copy_routing = yes
+	ignore_target_hosts = +bogus_public
 	transport = smtp
 	no_more