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

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

diff --git a/test/confs/0042 b/test/confs/0042
index a4a81bfbe9ac2df68c300f05b07266d034368ef5..46229f59fa68e60f861108b58a477a2bd55bf08a 100644 (file)
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,13 +1,7 @@
 # Exim test configuration 0042
 
 # Exim test configuration 0042
 

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

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


@@ -44,7 +38,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
   driver = appendfile
   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