From 2a47f02825993e5ade191f8206cb767b0d9fc44c Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 25 Dec 2012 22:16:29 +0000
Subject: 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.
---
 test/confs/0227 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'test/confs/0227')

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 -----
-- 
cgit v1.2.3