spam.m4: Don't bother reading custom spam limits in submission mode.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index 75b1c4c..3b3d82f 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -65,10 +65,11 @@ received_header_text = Received: \
              ${if def:sender_helo_name \
                   {(helo=$sender_helo_name)\n\t}}}}\
        by $primary_hostname \
+       (Exim $version_number)\
+       ${if def:tls_cipher {\n\t} { }}\
        ${if def:received_protocol \
             {with $received_protocol \
-             ${if def:tls_cipher {(cipher=$tls_cipher)\n\t}}}}\
-       (Exim $version_number)\n\t\
+             ${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
        ${if def:sender_address \
             {(envelope-from <$sender_address>\
              ${if def:authenticated_id \
@@ -249,10 +250,10 @@ smtp_local:
        tls_privatekey = CONF_sysconf_dir/client.key
        tls_verify_certificates = CONF_ca_dir/ca.cert
        tls_require_ciphers = CONF_good_ciphers
-       tls_dh_min_bits = 3070
+       tls_dh_min_bits = 2046
        tls_tempfail_tryclear = false
        authenticated_sender = ${if def:authenticated_id \
-                                   ${authenticated_id@CONF_master_domain} \
+                                   {$authenticated_id@CONF_master_domain} \
                                    fail}
 
 ## A standard transport for local delivery.