Testsuite: output changes arising

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 869084dd8113b4597afdeb667ce36acbdd8b41f6..7775fc4b0a44604644f577f1136d1cc4aafb7950 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -6,6 +6,7 @@ ALLOW=
 
 exim_path = EXIM_PATH
 keep_environment =
 
 exim_path = EXIM_PATH
 keep_environment =

+add_environment = SSLKEYLOGFILE=DIR/spool/sslkeys

 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog


@@ -16,6 +17,12 @@ tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 .ifdef _HAVE_REQTLS
 tls_advertise_requiretls = :
 .endif
 .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 -----
 
 
 # ----- Main settings -----


@@ -31,14 +38,13 @@ queue_only
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM

-log_selector = +received_recipients +dkim_verbose
+log_selector = +received_recipients +millisec +dkim_verbose

 .else
 .else

-log_selector = +received_recipients
+log_selector = +received_recipients +millisec

 .endif
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 .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}
+tls_certificate = DIR/aux-fixed/cert1

 .endif
 
 ALLOW
 .endif
 
 ALLOW


@@ -91,6 +97,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"


@@ -100,6 +107,9 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s


@@ -108,10 +118,14 @@ remote_smtp_dkim:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_S

+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
 
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
 

+.ifdef _HAVE_DKIM

 .ifdef SRV
   dkim_domain =                test.ex
   dkim_selector =      sel
 .ifdef SRV
   dkim_domain =                test.ex
   dkim_selector =      sel


@@ -120,6 +134,7 @@ remote_smtp_dkim:
   dkim_sign_headers =  LIST
 .endif
 .endif
   dkim_sign_headers =  LIST
 .endif
 .endif

+.endif

 
 # ----- Retry -----
 
 
 # ----- Retry -----