exchange.m4: Add the relevant information to `RCLNTLSNDR' warnings.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index 9d0808803698b552c5be892ae3731f4b3368849d..9182a7c7e9d46db20135a785ab88c44cffa4a34a 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -25,7 +25,7 @@
 ### Global settings.
 
 SECTION(global, priv)m4_dnl
-admin_groups = root : adm
+admin_groups = CONF_admin_groups
 prod_requires_admin = false
 
 SECTION(global, logging)m4_dnl
@@ -250,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.