Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 3401

diff --git a/test/confs/3401 b/test/confs/3401
index d2cf9c97299b7a74e43689c5121183ce132a9e63..401d5cfa5818702bdbe25fb76020c2d27aafe05f 100644 (file)
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -1,13 +1,9 @@
 # Exim test configuration 3401
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +smtp_mailauth
 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 -----
 
@@ -22,12 +18,19 @@ login:
   driver = plaintext
   public_name = LOGIN
   client_send = : userx : secret
+  client_set_id = userx
 
 plain:
   driver = plaintext
   public_name = PLAIN
   client_send = ^userx^secret
 
+xlogin:
+  driver = plaintext
+  public_name = XLOGIN
+  client_send = : $auth1 : $auth1+$auth2
+  client_set_id = $auth1
+
 
 # ----- Routers -----
 
@@ -52,14 +55,16 @@ begin transports
 
 smtp_try:
   driver = smtp
-  hosts_try_auth = *
   port = PORT_S
+  hosts_try_fastopen = :
+  hosts_try_auth = *
   authenticated_sender = ${if eq{$local_part}{forcesender}{force@x.y.z}fail}
 
 smtp_force:
   driver = smtp
-  hosts_require_auth = *
   port = PORT_S
+  hosts_try_fastopen = :
+  hosts_require_auth = *
 
 
 # ----- Retry -----