Fix taint issue in transport with DSN. Bug 2491

[users/jgh/exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 6816ef8c9c86a498e480fd7f8478010794cd74e2..4c824c4b41ecabf68a6614a4a777fa69afe6f1e5 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -13,6 +13,15 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_REQTLS
+tls_advertise_requiretls = :
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 
 # ----- Main settings -----
@@ -26,10 +35,17 @@ acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
 log_selector = +received_recipients
+.endif
 
+.ifdef _OPT_MAIN_TLS_CERTIFICATE
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.endif
 
 ALLOW
 
@@ -57,7 +73,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
-  transport =  remote_smtp${if eq {OPT}{dkim} {_dkim}}
+  transport =  remote_smtp${if eq {SRV}{dkim} {_dkim}}
   errors_to =  ""
 
 fail_remote_domains:
@@ -90,6 +106,7 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
+  hosts_try_fastopen = :
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
@@ -98,11 +115,13 @@ remote_smtp_dkim:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
+  hosts_try_fastopen = :
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
 
-.ifdef OPT
+.ifdef _HAVE_DKIM
+.ifdef SRV
   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
@@ -110,6 +129,7 @@ remote_smtp_dkim:
   dkim_sign_headers =  LIST
 .endif
 .endif
+.endif
 
 # ----- Retry -----