Merge branch 'master' into 4.next
[exim.git] / test / confs / 3455
index 274de63165d13ac53f2accc2b934c46ae8f040ed..cf7caed4f9fc399fbd150467fcd30f9e1902507c 100644 (file)
@@ -5,7 +5,6 @@ HOSTS_AVOID_TLS=
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
@@ -36,7 +35,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: