Logging: add I= element to transport-defer lines. Bug 2675

[exim.git] / test / confs / 0038

diff --git a/test/confs/0038 b/test/confs/0038
index 497623a6d243b0fc5297716a62512cb912ce55a3..0ef9028f163792ec24af2dbf81a7b22da88c6eda 100644 (file)
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -2,19 +2,15 @@
 
 RRATELIMIT=0/1h/strict
 DRATELIMIT=0/1h/per_byte/strict
+ACLRCPT=check_rcpt
+
+.include DIR/aux-var/std_conf_prefix
 
-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 = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = check_rcpt
+acl_smtp_rcpt = ACLRCPT
 acl_smtp_data = check_data
 qualify_domain = test.ex
 
@@ -31,6 +27,21 @@ check_rcpt:
                         sender_rate_period=$sender_rate_period
     accept
 
+check_rcpt2:
+    warn  ratelimit = RRATELIMIT/noupdate
+          log_message = RCPT2-1: \
+                        sender_rate=$sender_rate \
+                        sender_rate_limit=$sender_rate_limit \
+                        sender_rate_period=$sender_rate_period
+
+    warn  ratelimit = RRATELIMIT
+          log_message = RCPT2-2: \
+                        sender_rate=$sender_rate \
+                        sender_rate_limit=$sender_rate_limit \
+                        sender_rate_period=$sender_rate_period
+
+    accept
+
 check_data:
     warn  ratelimit = DRATELIMIT
           log_message = DATA: \