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

[exim-config] / lists.m4

diff --git a/lists.m4 b/lists.m4
index 2c458c7..42427af 100644 (file)
--- a/lists.m4
+++ b/lists.m4
@@ -43,11 +43,7 @@ domainlist thishost = @ : @[] : \
                         { telecaster=tele \
                           stratocaster=strat }}} \
              {$item.$qualify_domain}}
-domainlist public = +thishost : distorted.org.uk
-domainlist known = +public : \
-       ${if exists{CONF_sysconf_dir/domains.conf} \
-            {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
-            {}}
+domainlist public = +thishost : CONF_sysdomains
 
 ## Some magic lists used because `match_local_parts' and friends don't expand
 ## their right-hand sides.
@@ -55,6 +51,7 @@ localpartlist dom_users = ${expand:KV(users, {$value}{*})}
 localpartlist dom_locals = ${expand:KV(locals, {$value}{+user_extaddr})}
 localpartlist user_extaddr = ^CONF_user_extaddr_regexp
 addresslist user_extaddr = ^CONF_user_extaddr_regexp
+addresslist value = $value
 
 ## All of the `standard' local parts which ought to be provided by a domain.
 localpartlist required = postmaster : abuse