lists.m4: Preparation for switch to A&A.

[exim-config] / lists.m4

diff --git a/lists.m4 b/lists.m4
index 42427af70fe5e92417d531ad828dff554acbb4b1..8f12fd8fee20751bc497503d7376af5bca57fbc0 100644 (file)
--- a/lists.m4
+++ b/lists.m4
@@ -27,15 +27,21 @@ hostlist localnet = <; \
        127.0.0.0/8 ; ::1
 hostlist thishost = <; \
         +localnet ; @[]
+hostlist foreign = <; \
+       212.13.198.76 ; 2001:ba8:0:1d9::1:1
 hostlist border = <; \
+       ! +foreign ; \
        62.49.204.144/28 ; 2001:470:1f09:1b98::/64 ; \
+       81.2.113.195 ; 81.187.238.128/28 ; \
        212.13.198.64/28 ; 2001:ba8:0:1d9::/64
 hostlist trusted = <; \
        +localnet ; +border ; \
-       172.29.199.0/24 ; 2001:ba8:1d9::/49 ; 2001:470:9740::/49
+       172.29.199.0/24 ; 2001:8b0:c92::/49 ; \
+       2001:ba8:1d9::/49 ; 2001:470:9740::/49
 hostlist allnets = <; \
        +localnet ; +border ; \
-       172.29.198.0/23 ; 2001:ba8:1d9::/48 ; 2001:470:9740::/48
+       172.29.198.0/23 ; 2001:8b0:c92::/48 ; \
+       2001:ba8:1d9::/48 ; 2001:470:9740::/48
 
 ## Domains we're authoritative for.
 domainlist thishost = @ : @[] : \
@@ -45,14 +51,6 @@ domainlist thishost = @ : @[] : \
              {$item.$qualify_domain}}
 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