diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-12-25 22:16:29 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2013-01-06 13:30:04 +0000 |
| commit | 2a47f02825993e5ade191f8206cb767b0d9fc44c (patch) | |
| tree | 32242ad0b5fa128a9cc1f296b47df5e0ad4fe0db /test/confs | |
| parent | 181d9bf8a602a2573d566427803a4c5288a56008 (diff) | |
Restrict lifetime of $router_name and $transport_name. Bug 308.
The router name is explicitly nulled after the router exits;
the transport name is set only in the subprocess it runs in.
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0143 | 3 | ||||
| -rw-r--r-- | test/confs/0227 | 8 | ||||
| -rw-r--r-- | test/confs/0410 | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/test/confs/0143 b/test/confs/0143 index 08eb3f66a..ad18789c9 100644 --- a/test/confs/0143 +++ b/test/confs/0143 @@ -24,6 +24,7 @@ my_main_router: route_list = * 127.0.0.1 self = send transport = my_smtp + debug_print = router_name <$router_name> no_more @@ -35,7 +36,7 @@ my_smtp: driver = smtp interface = HOSTIPV4 port = PORT_S - debug_print = transport_name <$transport_name> from router <$router_name> + debug_print = transport_name <$transport_name> # End diff --git a/test/confs/0227 b/test/confs/0227 index 2f2178185..06fae3f56 100644 --- a/test/confs/0227 +++ b/test/confs/0227 @@ -26,25 +26,19 @@ 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) 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) 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 logwrite = verify header_sender used R:$router_name + accept # ----- Routers ----- diff --git a/test/confs/0410 b/test/confs/0410 index 934d8a1e8..b8da514f4 100644 --- a/test/confs/0410 +++ b/test/confs/0410 @@ -22,9 +22,7 @@ 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}} |