X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..1a6230a33e235e2b008caabd112f8bc6cb1bcc60:/test/stderr/0038?ds=sidebyside

diff --git a/test/stderr/0038 b/test/stderr/0038
index c3c0346f4..9f1632db5 100644
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -7,28 +7,34 @@
 >>> 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 "*")
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/strict
->>> ratelimit condition limit=0 period=3600 key=1h/strict / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
-LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> accept: condition test succeeded
+>>> 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"
 >>> check ratelimit = 0/1h/per_byte/strict
->>> ratelimit condition limit=0 period=3600 key=1h/per_byte/strict / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
-LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> deny: condition test succeeded
+>>> 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)
@@ -39,26 +45,33 @@ 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 "*")
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/strict
->>> ratelimit condition limit=0 period=3600 key=1h/strict / V4NET.9.8.7
->>> ratelimit computed rate 1.0
->>> warn: condition test succeeded
-LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> accept: condition test succeeded
+>>> 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"
 >>> check ratelimit = 0/1h/per_byte/strict
->>> ratelimit condition limit=0 period=3600 key=1h/per_byte/strict / V4NET.9.8.7
->>> ratelimit computed rate 19.0
->>> warn: condition test succeeded
-LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> deny: condition test succeeded
+>>> 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)
@@ -69,27 +82,34 @@ 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 "*")
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
-LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> accept: condition test succeeded
+>>> 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"
 >>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / V4NET.9.8.7
->>> ratelimit found pre-computed rate 0.0
->>> warn: condition test succeeded
-LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> deny: condition test succeeded
+>>> 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)
@@ -100,26 +120,33 @@ 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 "*")
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / V4NET.9.8.7
->>> ratelimit computed rate 1.0
->>> warn: condition test succeeded
-LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> accept: condition test succeeded
+>>> 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"
 >>> check ratelimit = 0/1h/per_conn/strict
->>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict / V4NET.9.8.7
->>> ratelimit found pre-computed rate 1.0
->>> warn: condition test succeeded
-LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> deny: condition test succeeded
+>>> 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)
@@ -130,44 +157,121 @@ 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 "*")
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/per_rcpt
->>> ratelimit condition limit=0 period=3600 key=1h/per_rcpt / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
-LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/per_rcpt
->>> ratelimit condition limit=0 period=3600 key=1h/per_rcpt / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
+>>> 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"
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_rcpt"
+>>> end of ACL "check_rcpt": ACCEPT
 >>> using ACL "check_rcpt"
 >>> processing "warn"
 >>> check ratelimit = 0/1h/per_rcpt
->>> ratelimit condition limit=0 period=3600 key=1h/per_rcpt / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
+>>> 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"
->>> accept: condition test succeeded
+>>> 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"
 >>> check ratelimit = 0/1h/per_conn
->>> ratelimit condition limit=0 period=3600 key=1h/per_conn / V4NET.9.8.7
->>> ratelimit initializing new key's data
->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
-LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
+>>> 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"
->>> deny: condition test succeeded
+>>> 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)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts? no (option unset)
+>>> host in helo_verify_hosts? no (option unset)
+>>> 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 "*")
+>>> using ACL "check_rcpt2"
+>>> processing "warn"
+>>> 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
+>>> ratelimit initializing new key's rate data
+>>> ratelimit db not updated: readonly mode
+>>> ratelimit computed rate 0.0
+>>> warn: condition test failed in ACL "check_rcpt2"
+>>> processing "warn"
+>>> 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"
+>>> accept: condition test succeeded in ACL "check_rcpt2"
+>>> end of ACL "check_rcpt2": ACCEPT
+>>> using ACL "check_rcpt2"
+>>> processing "warn"
+>>> 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
+>>> ratelimit initializing new key's rate data
+>>> ratelimit db not updated: readonly mode
+>>> ratelimit computed rate 0.0
+>>> warn: condition test failed in ACL "check_rcpt2"
+>>> processing "warn"
+>>> 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"
+>>> 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"
+>>> 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"
+>>> 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