MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

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

diff --git a/test/confs/3455 b/test/confs/3455
index 274de63165d13ac53f2accc2b934c46ae8f040ed..591d5de37dcb397859a419cf2fb01a8eb99dba39 100644 (file)
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -2,14 +2,9 @@
 
 HOSTS_AVOID_TLS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -36,7 +31,7 @@ plain:
   server_condition = "\
     ${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}"
   server_set_id = $2
-  client_condition = ${if !eq {$tls_cipher}{}}
+  client_condition = ${if !eq {$tls_out_cipher}{}}
   client_send = ^userx^secret1
 
 login:
@@ -66,6 +61,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_D
+  hosts_try_fastopen = :
   hosts_avoid_tls = HOSTS_AVOID_TLS
   hosts_require_auth = *
   allow_localhost