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

[exim.git] / test / confs / 0210

diff --git a/test/confs/0210 b/test/confs/0210
index 486f1ae3d15d650c43802760a719269a2017c6d8..3e5661ccba5e9e3969ae4bdb4d96f7f7fe160de1 100644 (file)
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -1,12 +1,7 @@
 # Exim test configuration 0210
 
 # Exim test configuration 0210
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -49,7 +44,7 @@ bsmtp_local_delivery:
   message_prefix = "HELO x.y.z\n"
   delivery_date_add
   envelope_to_add
   message_prefix = "HELO x.y.z\n"
   delivery_date_add
   envelope_to_add

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   return_path_add
   user = CALLER
 
   return_path_add
   user = CALLER
 


@@ -67,6 +62,7 @@ bsmtp_smtp:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----