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

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

diff --git a/test/confs/0460 b/test/confs/0460
index b40bd0ce6d2efdfcefbd207f7949476d866687f3..4918700f9c6f51f661814d5010f893d77002ccad 100644 (file)
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -1,19 +1,15 @@
 # Exim test configuration 0460
 
 # Exim test configuration 0460
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 
 # ----- Main settings -----
 
 qualify_domain = test.ex
 
 
 # ----- Main settings -----
 
 qualify_domain = test.ex

+queue_only
+queue_run_in_order

 
 acl_smtp_rcpt = accept
 
 
 acl_smtp_rcpt = accept
 


@@ -33,7 +29,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 # End
   user = CALLER
 
 # End