X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/exim-config/blobdiff_plain/6aae076feb9b8fc05099dc68fc00100472004701..1e5ccd7c52be79d1de45691a0bb46cbb1a686bf0:/exchange.m4

diff --git a/exchange.m4 b/exchange.m4
index b0dab45..9f8324a 100644
--- a/exchange.m4
+++ b/exchange.m4
@@ -52,12 +52,12 @@ mail_client_addr:
 			   {${if match_domain {$sender_address_domain} \
 					      {+public} \
 				 {+allnets}{! +allnets}}})}
-		 add_header = :after_received:X-Distorted-Warning: \
+		 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
+			host=$sender_host_address:>)
 
 	## OK.
 	accept
@@ -70,7 +70,12 @@ SECTION(routers, remote)m4_dnl
 ## Send mail on to a host in our own network.  We must apply extra security.
 local:
 	driver = dnslookup
-	domains = ! +known : *.CONF_master_domain
+	domains = ${if bool {${LOOKUP_DOMAIN($domain,
+			       {KV(service, {$value}{true})},
+			       {false})}} \
+		       {}{ ! +public : \
+			   CONF_master_domain : \
+			   *.CONF_master_domain }}
 	self = fail
 	transport = smtp_local
 	no_more
@@ -78,7 +83,10 @@ local:
 ## Send mail on to unknown hosts.
 remote:
 	driver = dnslookup
-	domains = ! +known
+	domains = ${if bool {${LOOKUP_DOMAIN($domain,
+			       {KV(service, {$value}{true})},
+			       {false})}} \
+		       {}{ ! +public }}
 	self = fail
 	transport = smtp
 	no_more