defs.m4: New macros for inserting separators into lists.

[exim-config] / lists.m4

diff --git a/lists.m4 b/lists.m4
index 85d48c229320c41e585ca7e7cdf1cfff01137022..42427af70fe5e92417d531ad828dff554acbb4b1 100644 (file)
--- a/lists.m4
+++ b/lists.m4
@@ -25,6 +25,8 @@ SECTION(global, lists)m4_dnl
 ## Definitions for known networks.
 hostlist localnet = <; \
        127.0.0.0/8 ; ::1
+hostlist thishost = <; \
+        +localnet ; @[]
 hostlist border = <; \
        62.49.204.144/28 ; 2001:470:1f09:1b98::/64 ; \
        212.13.198.64/28 ; 2001:ba8:0:1d9::/64
@@ -41,17 +43,18 @@ 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.
 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
 
 DIVERT(null)
 ###----- That's all, folks --------------------------------------------------