user-spam.m4: Fix indentation in the output.

[exim-config] / config.m4

diff --git a/config.m4 b/config.m4
index d64ba68e67961560cbda54685f6d6398900bffe9..ada2909322c0992c43ef639ccc03868aa3c2542b 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -24,6 +24,13 @@
 ## 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 domains.
+DEFCONF(sysdomains, CONF_master_domain)
+
+## The magic token for local header names.
+DEFCONF(header_token, Distorted)
+
 ## The smarthost for satellite hosts.
 DEFCONF(smarthost, mail.distorted.org.uk)
 
@@ -63,11 +70,10 @@ DEFCONF(ca_dir, /etc/ca)
 
 ## User address suffix handling.
 DEFCONF(user_suffix_list, +* : -*)
-DEFCONF(user_extaddr_regexp, $acl_c_user([-+@]|\$))
 DEFCONF(user_extaddr_fixup, ${sg {$local_part_suffix}{^[-+]}{}})
 
 ## Other hosts allowed to relay mail through us.
-DEFCONF(relay_clients, +trusted)
+DEFCONF(relay_clients, <; +trusted ; 172.29.80.8)
 
 ## TLS-related settings.  We're assuming GNUTLS here, rather than OpenSSL.
 ## For local connections we are very strict.  For random clients, we try