X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/exim-config/blobdiff_plain/5051a30f491335189038d41671b6d494c4d716e0..31c922203e7c08f64c983044985d31d3470db13f:/base.m4

diff --git a/base.m4 b/base.m4
index 579e835..1c9dacf 100644
--- a/base.m4
+++ b/base.m4
@@ -26,6 +26,7 @@
 
 SECTION(global, priv)m4_dnl
 admin_groups = CONF_admin_groups
+trusted_groups = CONF_trusted_groups
 prod_requires_admin = false
 
 SECTION(global, logging)m4_dnl
@@ -39,7 +40,7 @@ syslog_timestamp = false
 
 SECTION(global, daemon)m4_dnl
 local_interfaces = <; CONF_interfaces
-extra_local_interfaces = <; 0.0.0.0 ; ::
+extra_local_interfaces = <; 0.0.0.0 ; ::0
 
 SECTION(global, resource)m4_dnl
 deliver_queue_load_max = 8
@@ -89,7 +90,7 @@ SECTION(global, bounce)m4_dnl
 delay_warning = 1h : 24h : 2d
 
 SECTION(global, tls)m4_dnl
-tls_certificate = CONF_sysconf_dir/server.cert
+tls_certificate = CONF_sysconf_dir/server.certlist
 tls_privatekey = CONF_sysconf_dir/server.key
 tls_advertise_hosts = ${if exists {CONF_sysconf_dir/server.key} {*}{}}
 tls_dhparam = CONF_ca_dir/dh-param-2048.pem
@@ -428,7 +429,7 @@ smtp_dhbits_2048:
 smtp_local:
 	driver = smtp
 	hosts_require_tls = *
-	tls_certificate = CONF_sysconf_dir/client.cert
+	tls_certificate = CONF_sysconf_dir/client.certlist
 	tls_privatekey = CONF_sysconf_dir/client.key
 	tls_verify_certificates = CONF_ca_dir/ca.cert
 	tls_require_ciphers = CONF_good_ciphers