Check for missing commandline arg after options taking one. Bug 3049

[exim.git] / test / confs / 2125

diff --git a/test/confs/2125 b/test/confs/2125
index be2fe1be30baae8b721c69c603f8de40f5adbe8d..91b5283b2754ff3ea7d575cf3949127c797b65f2 100644 (file)
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -19,12 +19,11 @@ tls_advertise_hosts = *
 
 tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
                       {AES256}{AES128}}
 
 tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
                       {AES256}{AES128}}

+tls_certificate = DIR/aux-fixed/cert1

 
 

-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -45,10 +44,12 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

+  port = PORT_D

   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = AES128-SHA
   hosts_require_tls = HOSTIPV4
   tls_require_ciphers = AES128-SHA

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

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