diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0143 | 7 | ||||
| -rw-r--r-- | test/confs/0227 | 10 | ||||
| -rw-r--r-- | test/confs/0325 | 8 | ||||
| -rw-r--r-- | test/confs/0410 | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/test/confs/0143 b/test/confs/0143 index c853c8072..08eb3f66a 100644 --- a/test/confs/0143 +++ b/test/confs/0143 @@ -18,12 +18,12 @@ domainlist local_domains = test.ex : *.test.ex begin routers -all: +my_main_router: driver = manualroute domains = ! +local_domains route_list = * 127.0.0.1 self = send - transport = smtp + transport = my_smtp no_more @@ -31,10 +31,11 @@ all: begin transports -smtp: +my_smtp: driver = smtp interface = HOSTIPV4 port = PORT_S + debug_print = transport_name <$transport_name> from router <$router_name> # End diff --git a/test/confs/0227 b/test/confs/0227 index 17f49eb76..2f2178185 100644 --- a/test/confs/0227 +++ b/test/confs/0227 @@ -26,21 +26,25 @@ check_recipient: control = no_multiline_responses accept hosts = V4NET.0.0.4 deny hosts = V4NET.0.0.1 + log_message = ($sender_verify_failure) R:$router_name !verify = sender/callout=no_cache deny hosts = V4NET.0.0.3 - log_message = ($recipient_verify_failure) + log_message = ($recipient_verify_failure) R:$router_name !verify = recipient/callout=no_cache + warn logwrite = verify recipient used R:$router_name deny hosts = V4NET.0.0.5 - log_message = ($sender_verify_failure) + log_message = ($sender_verify_failure) R:$router_name !verify = sender/callout=no_cache/check_postmaster require verify = sender + logwrite = verify sender used R:$router_name accept domains = +local_domains deny message = relay not permitted check_data: deny hosts = V4NET.0.0.4 + log_message = header_sender R:$router_name !verify = header_sender/callout=no_cache - accept + accept logwrite = verify header_sender used R:$router_name # ----- Routers ----- diff --git a/test/confs/0325 b/test/confs/0325 index f56b01bd7..5310dcc8d 100644 --- a/test/confs/0325 +++ b/test/confs/0325 @@ -41,7 +41,7 @@ r1: 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 @@ -49,7 +49,7 @@ r2: 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 @@ -57,7 +57,7 @@ r3: 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 @@ -65,7 +65,7 @@ r4: 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 ----- diff --git a/test/confs/0410 b/test/confs/0410 index b8da514f4..934d8a1e8 100644 --- a/test/confs/0410 +++ b/test/confs/0410 @@ -22,7 +22,9 @@ begin ACL rcpt: accept verify = recipient + logwrite = rcpt R:$router_name verify = sender + logwrite = sndr R:$router_name condition = ${if eq {$address_data}{ADDRESS_DATA_STRING}{yes}{no}} condition = ${if eq {$sender_address_data}{SENDER_ADDRESS_DATA_STRING}{yes}{no}} |