Testsuite: another go at munging cipher-suite strings

[users/heiko/exim.git] / test / confs / 5740

diff --git a/test/confs/5740 b/test/confs/5740
index 4c6345a8a1aac7c6ae43929a9fb6e2d1b7a6090d..4d41e820bc8bbc222980e51fb7dd43777eb1dab3 100644 (file)
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -6,11 +6,12 @@ SERVER =
 exim_path = EXIM_PATH
 keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
-primary_hostname = server1.example.com
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+primary_hostname = server1.example.com
 
 
 # ----- Main settings -----
@@ -20,7 +21,7 @@ domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = check_recipient
 acl_smtp_data = check_data
 
-log_selector = +tls_peerdn
+log_selector = +tls_peerdn +received_recipients
 remote_max_parallel = 1
 
 tls_advertise_hosts = *
@@ -38,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
 fail}
 
-tls_ocsp_file = OCSP
+tls_ocsp_file = RETURN
 
 
 # ------ ACL ------
@@ -70,7 +71,7 @@ client:
   condition = ${if eq {SERVER}{server}{no}{yes}}
   retry_use_local_part
   transport = send_to_server${if eq{$local_part}{nostaple}{1} \
-                               {${if eq{$local_part}{norequire} {2} \
+                               {${if match{$local_part}{norequire} {2} \
                                {${if eq{$local_part}{smtps} {4}{3}}} \
                             }}}