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

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

diff --git a/test/confs/0306 b/test/confs/0306
index 6e14b31dd5ff10aaff1c90f4c23fbe353f12b314..b3c18f4fa670f031cc452afc24c09c850d33b456 100644 (file)
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,14 +1,8 @@
 # Exim test configuration 0306
 
 # Exim test configuration 0306
 

-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 -----
 
 
 # ----- Main settings -----
 


@@ -33,14 +27,14 @@ r1:
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request

-  file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix
+  file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}

 
 r2:
   driver = redirect
   domains = lists.test.ex
   senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
 
 r2:
   driver = redirect
   domains = lists.test.ex
   senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\

-             {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}
-  file = DIR/aux-fixed/TESTNUM/$local_part
+             {lsearch;${bless:DIR/aux-fixed/TESTNUM/$local_part}}{*}}
+  file = DIR/aux-fixed/TESTNUM/${bless:$local_part}

   forbid_pipe
   forbid_file
   one_time
   forbid_pipe
   forbid_file
   one_time


@@ -70,7 +64,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
 
 t2:
   user = CALLER
 
 t2: