Taint: de-taint $2 (fixed part of key) from a matching partial-search

[user/henk/code/exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 7775fc4b0a44604644f577f1136d1cc4aafb7950..2d53eff1a227889bc68a9d7bfd541050d3b55480 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -13,9 +13,8 @@ log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
+.ifdef _HAVE_TLS
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
-.ifdef _HAVE_REQTLS
-tls_advertise_requiretls = :
 .endif
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
@@ -23,7 +22,9 @@ pipelining_connect_advertise_hosts = :
 .ifdef _HAVE_DMARC
 dmarc_tld_file =
 .endif
-
+.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS
+limits_advertise_hosts = !*
+.endif
 
 # ----- Main settings -----
 
@@ -38,12 +39,12 @@ queue_only
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM
-log_selector = +received_recipients +millisec +dkim_verbose
+log_selector = +received_recipients +connection_id +millisec +dkim_verbose
 .else
-log_selector = +received_recipients +millisec
+log_selector = +received_recipients +connection_id +millisec
 .endif
 
-.ifdef _OPT_MAIN_TLS_CERTIFICATE
+.ifdef _HAVE_TLS
 tls_certificate = DIR/aux-fixed/cert1
 .endif
 
@@ -108,8 +109,10 @@ remote_smtp:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
+.ifdef _HAVE_TLS
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =
+.endif
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
@@ -119,8 +122,10 @@ remote_smtp_dkim:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
+.ifdef _HAVE_TLS
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =
+.endif
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s