Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 5841

diff --git a/test/confs/5841 b/test/confs/5841
index 867c1607f7dac8e96030dcb2b29e8f8f9215f580..e1d2c28be54132979f05aa624b9d8eeab749850e 100644 (file)
--- a/test/confs/5841
+++ b/test/confs/5841
@@ -2,7 +2,7 @@
 # DANE/OpenSSL - ciphers option
 
 SERVER=
 # DANE/OpenSSL - ciphers option
 
 SERVER=

-OPT=
+LIST=

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -23,7 +23,13 @@ tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem}fail}
 tls_privatekey =  ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key}fail}
 
 # Permit two specific ciphers
 tls_privatekey =  ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key}fail}
 
 # Permit two specific ciphers

-tls_require_ciphers = ECDHE-RSA-CAMELLIA256-SHA384:ECDHE-RSA-AES256-GCM-SHA384
+tls_require_ciphers = DHE-RSA-CAMELLIA256-SHA:ECDHE-RSA-AES256-GCM-SHA384
+
+# Force TLS1.2 so that the ciphers choice works
+
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif

 
 # ----- Routers -----
 begin routers
 
 # ----- Routers -----
 begin routers


@@ -31,6 +37,7 @@ begin routers
 client:
   driver =             dnslookup
   condition =          ${if eq {SERVER}{}}
 client:
   driver =             dnslookup
   condition =          ${if eq {SERVER}{}}

+  ignore_target_hosts = <; 0::0/0

   dnssec_request_domains = *
   self =               send
   transport =          send_to_server
   dnssec_request_domains = *
   self =               send
   transport =          send_to_server


@@ -47,12 +54,13 @@ send_to_server:
   driver =                     smtp
   allow_localhost
   port =                       PORT_D
   driver =                     smtp
   allow_localhost
   port =                       PORT_D

+  hosts_try_fastopen =         :

   hosts_try_dane =             *
   tls_verify_certificates =    CDIR2/ca_chain.pem
 
   # Some commonly-available cipher, we hope
   tls_require_ciphers =                ECDHE-RSA-AES256-GCM-SHA384
   hosts_try_dane =             *
   tls_verify_certificates =    CDIR2/ca_chain.pem
 
   # Some commonly-available cipher, we hope
   tls_require_ciphers =                ECDHE-RSA-AES256-GCM-SHA384

-  dane_require_tls_ciphers =   OPT
+  dane_require_tls_ciphers =   LIST

 
 # ----- Retry -----
 begin retry
 
 # ----- Retry -----
 begin retry