X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9fd2d621273cc5d9f38af480ed40bb16521bd86d..3f63e46192d8d9ad72e9b25602615042bcc404f6:/test/stderr/0038

diff --git a/test/stderr/0038 b/test/stderr/0038
index 141a1121d..8c11745d3 100644
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -7,29 +7,35 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/strict
 >>> ratelimit condition count=1 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit creating new rate data block
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 1.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 46)
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 1.0
+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>> deny: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": DENY
 LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -40,28 +46,34 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/strict
 >>> ratelimit condition count=1 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found key in database
 >>> ratelimit db updated
 >>> ratelimit computed rate 2.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 46)
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 2.0
+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>> deny: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": DENY
 LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -72,29 +84,35 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit creating new rate data block
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 1.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 46)
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 1.0
+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>> deny: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": DENY
 LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -105,28 +123,34 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found key in database
 >>> ratelimit db updated
 >>> ratelimit computed rate 2.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 46)
 >>> check ratelimit = 0/1h/per_conn/strict
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found pre-computed rate 2.0
+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>> deny: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": DENY
 LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -137,53 +161,63 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/per_rcpt
 >>> ratelimit condition count=1 0.0/1h/per_rcpt/V4NET.9.8.7
 >>> ratelimit creating new rate data block
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
 LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/per_rcpt
 >>> ratelimit condition count=1 0.0/1h/per_rcpt/V4NET.9.8.7
 >>> ratelimit creating new rate data block
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> using ACL "check_rcpt"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 23)
 >>> check ratelimit = 0/1h/per_rcpt
 >>> ratelimit condition count=1 0.0/1h/per_rcpt/V4NET.9.8.7
 >>> ratelimit creating new rate data block
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 1.0
+>>> l_message: RCPT: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_rcpt"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 28)
 >>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 46)
 >>> check ratelimit = 0/1h/per_conn
 >>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
 >>> ratelimit found key in database
 >>> ratelimit db not updated: over the limit, but leaky
 >>> ratelimit computed rate 3.0
+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=3.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>> deny: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": DENY
 LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -194,9 +228,11 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_rcpt2"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check ratelimit = 1/1m/per_rcpt/noupdate
 >>> ratelimit condition count=0 1.0/1m/per_rcpt/V4NET.9.8.6
 >>> ratelimit creating new rate data block
@@ -204,15 +240,16 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit db not updated: readonly mode
 >>> ratelimit computed rate 0.0
 >>> warn: condition test failed in ACL "check_rcpt2"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 37)
 >>> check ratelimit = 1/1m/per_rcpt
 >>> ratelimit condition count=1 1.0/1m/per_rcpt/V4NET.9.8.6
 >>> ratelimit found pre-computed rate 0.0
 >>> warn: condition test failed in ACL "check_rcpt2"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 43)
 >>> accept: condition test succeeded in ACL "check_rcpt2"
+>>> end of ACL "check_rcpt2": ACCEPT
 >>> using ACL "check_rcpt2"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 31)
 >>> check ratelimit = 1/1m/per_rcpt/noupdate
 >>> ratelimit condition count=0 1.0/1m/per_rcpt/V4NET.9.8.6
 >>> ratelimit creating new rate data block
@@ -220,24 +257,27 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> ratelimit db not updated: readonly mode
 >>> ratelimit computed rate 0.0
 >>> warn: condition test failed in ACL "check_rcpt2"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 37)
 >>> check ratelimit = 1/1m/per_rcpt
 >>> ratelimit condition count=1 1.0/1m/per_rcpt/V4NET.9.8.6
 >>> ratelimit found pre-computed rate 0.0
 >>> warn: condition test failed in ACL "check_rcpt2"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 43)
 >>> accept: condition test succeeded in ACL "check_rcpt2"
+>>> end of ACL "check_rcpt2": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 46)
 >>> check ratelimit = 0/1h/per_byte/strict
 >>> ratelimit condition count=19 0.0/1h/per_mail/V4NET.9.8.6
 >>> ratelimit creating new rate data block
 >>> ratelimit initializing new key's rate data
 >>> ratelimit db updated
 >>> ratelimit computed rate 19.0
+>>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period
 >>> warn: condition test succeeded in ACL "check_data"
 LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 51)
 >>> deny: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": DENY
 LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] F=<> rejected after DATA