Add $router_name and $transport_name variables. Bug 308.

[users/heiko/exim.git] / test / confs / 0227

diff --git a/test/confs/0227 b/test/confs/0227
index 17f49eb76fe85cd14e4f86d7a4f946b68dbcfbc9..2f2178185d1ed6fb7ddcd965fe9a2f04d4678db1 100644 (file)
--- 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
           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
          !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
          !verify   = recipient/callout=no_cache

+  warn    logwrite = verify recipient used R:$router_name

   deny    hosts    = V4NET.0.0.5
   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
          !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
   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
          !verify = header_sender/callout=no_cache

-  accept
+  accept logwrite = verify header_sender used R:$router_name

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----