EXPERIMENTAL_DSN: use the SMTP return messsage for Diagnostic-Code lines. Bug 1559

[exim.git] / test / confs / 0218

diff --git a/test/confs/0218 b/test/confs/0218
index a585870ef1bc0bd9d56035004e0dfea25a033bc9..2a4bff68d82e27da66b2b468740347288dd2fc8a 100644 (file)
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -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 = ""


@@ -19,6 +18,13 @@ queue_run_in_order
 queue_only
 
 
 queue_only
 
 

+# ----- ACLs ----
+
+begin acl
+
+expand_check:
+  accept message = ACL
+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -30,11 +36,13 @@ bounce:
   data = :fail: just discard
   retry_use_local_part
   senders = :
   data = :fail: just discard
   retry_use_local_part
   senders = :

+  debug_print = R: $router_name  (${acl {expand_check}})

 
 client:
   driver = accept
   retry_use_local_part
   transport = send_to_server
 
 client:
   driver = accept
   retry_use_local_part
   transport = send_to_server

+  debug_print = R: $router_name  (${acl {expand_check}})

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


@@ -47,6 +55,7 @@ send_to_server:
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S

+  debug_print = T: $transport_name  (${acl {expand_check}})

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----