Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / confs / 0403

diff --git a/test/confs/0403 b/test/confs/0403
index a4e5f76eb29b9d23d82226f027211e1a2b34901a..4fe478b0915e5ee3a68ad619828680f1a9088c27 100644 (file)
--- a/test/confs/0403
+++ b/test/confs/0403
@@ -1,13 +1,7 @@
 # Exim test configuration 0403
 
-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 -----
 
@@ -20,13 +14,23 @@ qualify_domain = test.ex
 begin routers
 
 r1:
-  driver = redirect
-  domains = lsearch;DIR/aux-fixed/TESTNUM.data
-  local_parts = lsearch;DIR/aux-fixed/TESTNUM.data
-  address_data = ADDRESSDATA
-  file_transport = t1
-  data = DIR/test-mail/junk
-  router_home_directory = /usr
+  driver =             redirect
+  domains =                ${domain:${lookup {$local_part@$domain} lsearch,ret=key {DIR/aux-fixed/TESTNUM.accountfile}}}
+  local_parts =                ${local_part:${lookup {$local_part@$domain} lsearch,ret=key {DIR/aux-fixed/TESTNUM.accountfile}}}
+  file_transport =     t1
+  data =               DIR/test-mail/junk
+  debug_print = +++ROUTER:\n\
+                +++domain_data=$domain_data\n\
+                +++local_part_data=$local_part_data
+
+r2:
+  driver =             redirect
+  domains =            lsearch;DIR/aux-fixed/TESTNUM.data
+  local_parts =                lsearch;DIR/aux-fixed/TESTNUM.data
+  address_data =       ADDRESSDATA
+  file_transport =     t1
+  data =               DIR/test-mail/junk
+  router_home_directory =      /usr
   debug_print = +++ROUTER:\n\
                 +++domain_data=$domain_data\n\
                 +++local_part_data=$local_part_data\n\