Testsuite: munge for EXPERIMENTAL_DSN_INFO

[exim.git] / test / confs / 5892

diff --git a/test/confs/5892 b/test/confs/5892
index 4e6883fc2cccf839834369b663b43fc05f2f38ee..15b09fcff9072d1eae744ad7cd7f5c7c72080c08 100644 (file)
--- a/test/confs/5892
+++ b/test/confs/5892
@@ -15,7 +15,11 @@ acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient
 log_selector = +received_recipients +tls_resumption +tls_peerdn
 
 acl_smtp_rcpt = check_recipient
 log_selector = +received_recipients +tls_resumption +tls_peerdn
 

+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X

 openssl_options = +no_sslv2 +no_sslv3 +single_dh_use OPTION
 openssl_options = +no_sslv2 +no_sslv3 +single_dh_use OPTION

+.else
+openssl_options = +no_sslv2 +no_sslv3 +single_dh_use
+.endif

 tls_advertise_hosts = *
 
 # Set certificate only if server
 tls_advertise_hosts = *
 
 # Set certificate only if server


@@ -26,6 +30,7 @@ tls_certificate = CDIR/server1.example.com/server1.example.com.chain.pem
 tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key
 
 tls_resumption_hosts = 127.0.0.1
 tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key
 
 tls_resumption_hosts = 127.0.0.1

+remote_max_parallel = 1

 
 
 # ------ ACL ------
 
 
 # ------ ACL ------


@@ -66,7 +71,7 @@ begin routers
 client:
   driver =     accept
   condition =  ${if eq {SERVER}{server}{no}{yes}}
 client:
   driver =     accept
   condition =  ${if eq {SERVER}{server}{no}{yes}}

-  transport =  send_to_server${if eq{$local_part}{abcd}{2}{1}}
+  transport =  send_to_server${if eq{$local_part}{hostnotresume}{2}{1}}

 
 server:
   driver = redirect
 
 server:
   driver = redirect


@@ -82,6 +87,9 @@ send_to_server1:
   hosts =                      127.0.0.1
   port =                       PORT_D
   helo_data =                  helo.data.changed
   hosts =                      127.0.0.1
   port =                       PORT_D
   helo_data =                  helo.data.changed

+.ifdef HELO_MSG
+  host_name_extract =          HELO_MSG
+.endif

 .ifdef VALUE
   tls_resumption_hosts =       *
 .else
 .ifdef VALUE
   tls_resumption_hosts =       *
 .else