base.m4, exchange.m4: Improve key/value syntax in warnings.

[exim-config] / exchange.m4

diff --git a/exchange.m4 b/exchange.m4
index ee27e3c..e7d5fa4 100644 (file)
--- a/exchange.m4
+++ b/exchange.m4
@@ -47,12 +47,6 @@ SECTION(acl, mail-hooks)m4_dnl
        ## Check that a submitted message's sender address is allowable.
        require  acl = mail_client_addr
 
-       ## Insist that a local client connect through TLS.
-       deny     message = Hosts within CONF_master_domain must use TLS
-               !condition = ${if eq{$acl_c_mode}{submission}}
-                hosts = +allnets
-               !encrypted = *
-
 SECTION(acl, misc)m4_dnl
 mail_client_addr:
 
@@ -73,7 +67,9 @@ mail_client_addr:
                 add_header = :after_received:X-Distorted-Warning: \
                        RCLNTLSNDR \
                        Apparently local sender, but received from remote \
-                       server.
+                       server.\n\t\
+                       sender=$sender_address \
+                       host=$sender_host_address
 
        ## OK.
        accept