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

[exim.git] / test / confs / 0375

diff --git a/test/confs/0375 b/test/confs/0375
index f5bf7783f4da1be1f1c05604ddbb19ee625853d2..dce134ef7233af7b900920222e84070513d5cd3a 100644 (file)
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,13 +1,8 @@
 # Exim test configuration 0375
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_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 -----
 
@@ -90,7 +85,7 @@ begin transports
 # Successful local transport
 ut1:
   driver = appendfile
-  file = DIR/test-mail/$local_part-u
+  file = DIR/test-mail/${bless:$local_part}-u
   user = CALLER
   return_path_add
   envelope_to_add
@@ -119,7 +114,7 @@ ut4:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
+  hosts_try_fastopen = :
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -130,7 +125,7 @@ ut5:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
+  hosts_try_fastopen = :
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -142,7 +137,7 @@ ut6:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
+  hosts_try_fastopen = :
   allow_localhost
   max_rcpt = 1
   disable_logging
@@ -151,7 +146,7 @@ ut6:
 # Real delivery
 real:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
   return_path_add
   envelope_to_add