Improve the consistency of logging incoming and outgoing interfaces.

[users/jgh/exim.git] / test / confs / 0325

diff --git a/test/confs/0325 b/test/confs/0325
index f56b01bd7f13fd0ec7cab439bb9a475f46896532..d6f006e7b22cb58011938278582e5e57120b6c4b 100644 (file)
--- a/test/confs/0325
+++ b/test/confs/0325
@@ -3,7 +3,6 @@
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -41,7 +40,7 @@ r1:
   local_parts = lsearch;DIR/aux-fixed/TESTNUM.data
   data =
   debug_print = r1: \$domain_data = $domain_data\n\
   local_parts = lsearch;DIR/aux-fixed/TESTNUM.data
   data =
   debug_print = r1: \$domain_data = $domain_data\n\

-                r1: \$local_part_data = $local_part_data
+                $router_name: \$local_part_data = $local_part_data

 
 r2:
   driver = redirect
 
 r2:
   driver = redirect


@@ -49,7 +48,7 @@ r2:
   local_parts = lsearch;DIR/aux-fixed/TESTNUM.data
   data =
   debug_print = r2: \$domain_data = $domain_data\n\
   local_parts = lsearch;DIR/aux-fixed/TESTNUM.data
   data =
   debug_print = r2: \$domain_data = $domain_data\n\

-                r2: \$local_part_data = $local_part_data
+                $router_name: \$local_part_data = $local_part_data

 
 r3:
   driver = redirect
 
 r3:
   driver = redirect


@@ -57,7 +56,7 @@ r3:
   local_parts = +test_local_parts
   data =
   debug_print = r3: \$domain_data = $domain_data\n\
   local_parts = +test_local_parts
   data =
   debug_print = r3: \$domain_data = $domain_data\n\

-                r3: \$local_part_data = $local_part_data
+                $router_name: \$local_part_data = $local_part_data

 
 r4:
   driver = accept
 
 r4:
   driver = accept


@@ -65,7 +64,7 @@ r4:
   local_parts = +test_local_parts
   transport = t1
   debug_print = r4: \$domain_data = $domain_data\n\
   local_parts = +test_local_parts
   transport = t1
   debug_print = r4: \$domain_data = $domain_data\n\

-                r4: \$local_part_data = $local_part_data
+                $router_name: \$local_part_data = $local_part_data

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----