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

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

diff --git a/test/confs/0226 b/test/confs/0226
index 9ebdb791757ccec73c30d3247918de332432ce63..f5be03e9dab85883393460829c82582618bb1da5 100644 (file)
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -1,11 +1,7 @@
 # Exim test configuration 0226
 
 # Exim test configuration 0226
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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 -----
 


@@ -38,7 +34,7 @@ allowed:
   driver = redirect
   allow_defer
   caseful_local_part
   driver = redirect
   allow_defer
   caseful_local_part

-  data = $local_part
+  data = ${bless:$local_part}

   file_transport = address_file
   pipe_transport = address_pipe
   retry_use_local_part
   file_transport = address_file
   pipe_transport = address_pipe
   retry_use_local_part


@@ -51,7 +47,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

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

   user = CALLER
 
 address_file:
   user = CALLER
 
 address_file: