config.m4, exchange.m4, lists.m4: Allow optout from serving main domain.

This is useful for hosts which provide external mail service for
special subdomains, but don't provide service for local users.

diff --git a/config.m4 b/config.m4
index d64ba68e67961560cbda54685f6d6398900bffe9..ee20d3a7238394de76559f72b5bc241214118890 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -24,6 +24,10 @@
 ## Master domain name.
 DEFCONF(master_domain, distorted.org.uk)
 
+## List of home-system mail domain names.  This can be empty if we only
+## provide service for special-purpose domanis.
+DEFCONF(sysdomains, CONF_master_domain)
+
 ## The smarthost for satellite hosts.
 DEFCONF(smarthost, mail.distorted.org.uk)
 

diff --git a/exchange.m4 b/exchange.m4
index b0dab45cc9393b4bd91f3a2874ccc94c3c8d23b2..1e82249b49f490751d6dd90eb9ec90661e4a6f39 100644 (file)
--- a/exchange.m4
+++ b/exchange.m4
@@ -70,7 +70,7 @@ 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
+       domains = ! +known : CONF_master_domain : *.CONF_master_domain
        self = fail
        transport = smtp_local
        no_more

diff --git a/lists.m4 b/lists.m4
index 39f2ee4af0f8dad22c529a5aa99ffc064cefc24d..58cb9486196561f0736b2b33b5703027defdb44f 100644 (file)
--- a/lists.m4
+++ b/lists.m4
@@ -43,7 +43,7 @@ domainlist thishost = @ : @[] : \
                         { telecaster=tele \
                           stratocaster=strat }}} \
              {$item.$qualify_domain}}
-domainlist public = +thishost : distorted.org.uk
+domainlist public = +thishost : CONF_sysdomains
 domainlist known = +public : \
        ${if exists{CONF_sysconf_dir/domains.conf} \
             {partial0-lsearch; CONF_sysconf_dir/domains.conf} \