spam.m4: Rename X-SpamAssassin-* headers to X-Distorted-SpamAssassin-*.

[exim-config] / lists.m4

diff --git a/lists.m4 b/lists.m4
index 2c458c7df5f581e1e4a718ab81b1d107d339ed78..11e1baa95deb38703cf93e4c37b3f6011bfd3f44 100644 (file)
--- a/lists.m4
+++ b/lists.m4
@@ -27,7 +27,11 @@ hostlist localnet = <; \
        127.0.0.0/8 ; ::1
 hostlist thishost = <; \
         +localnet ; @[]
+hostlist foreign = <; \
+       212.13.198.75 ; 2001:ba8:0:1d9::2:1 ; \
+       212.13.198.76 ; 2001:ba8:0:1d9::1:1
 hostlist border = <; \
+       ! +foreign ; \
        62.49.204.144/28 ; 2001:470:1f09:1b98::/64 ; \
        212.13.198.64/28 ; 2001:ba8:0:1d9::/64
 hostlist trusted = <; \
@@ -43,18 +47,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} \
-            {}}
-
-## 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
+domainlist public = +thishost : CONF_sysdomains
 
 ## All of the `standard' local parts which ought to be provided by a domain.
 localpartlist required = postmaster : abuse