base.m4: Exim wants `::0' rather than `::' as the magic IPv6 wildcard.

[exim-config] / exchange.m4

diff --git a/exchange.m4 b/exchange.m4
index 4a7790d..1e82249 100644 (file)
--- a/exchange.m4
+++ b/exchange.m4
@@ -27,18 +27,6 @@
 SECTION(global, daemon)m4_dnl
 daemon_smtp_ports = CONF_smtp_port : CONF_submission_port
 
-SECTION(global, tls)m4_dnl
-tls_certificate = CONF_sysconf_dir/server.cert
-tls_privatekey = CONF_sysconf_dir/server.key
-tls_advertise_hosts = *
-tls_dhparam = CONF_ca_dir/dh-param-2048.pem
-tls_require_ciphers = ${if or {{={$received_port}{CONF_submission_port}} \
-                              {match_ip {$sender_host_address}{+trusted}}} \
-                          {CONF_good_ciphers} \
-                          {CONF_acceptable_ciphers}}
-tls_verify_certificates = CONF_ca_dir/ca.cert
-tls_verify_hosts = ${if eq{$acl_c_mode}{submission} {} {+allnets}}
-
 DIVERT(null)
 ###--------------------------------------------------------------------------
 ### Check source addresses for apparently local senders.
@@ -68,7 +56,7 @@ mail_client_addr:
                        RCLNTLSNDR \
                        Apparently local sender, but received from remote \
                        server.\n\t\
-                       sender=$sender_address, \
+                       sender=$sender_address \
                        host=$sender_host_address
 
        ## OK.
@@ -82,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