From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 2 Apr 2015 01:35:19 +0000 (+0100)
Subject: exchange.m4, lists.m4: Standard routing for `service=no' domains.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/exim-config/commitdiff_plain/4806403d9530b7c0eb5b7e048e6a2caac136addf

exchange.m4, lists.m4: Standard routing for `service=no' domains.

Domains listed in `domains.conf' with `service = false' or similar get
the standard routing arrangements, and aren't subject to virtual-host
processing.
---

diff --git a/exchange.m4 b/exchange.m4
index 1e82249..cfdcf9a 100644
--- a/exchange.m4
+++ b/exchange.m4
@@ -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 : *.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
diff --git a/lists.m4 b/lists.m4
index 58cb948..42427af 100644
--- a/lists.m4
+++ b/lists.m4
@@ -44,10 +44,6 @@ domainlist thishost = @ : @[] : \
 			   stratocaster=strat }}} \
 	      {$item.$qualify_domain}}
 domainlist public = +thishost : CONF_sysdomains
-domainlist known = +public : \
-	${if exists{CONF_sysconf_dir/domains.conf} \
-	     {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
-	     {}}
 
 ## Some magic lists used because `match_local_parts' and friends don't expand
 ## their right-hand sides.