Taint: reject or log more tainted list metadata elements

[exim.git] / test / stderr / 0038

diff --git a/test/stderr/0038 b/test/stderr/0038
index 5176c99a34f02f3b2f9063af8832cf9f2de71bcb..7f236accaa3674f933eca1e74bd80c466d47b96c 100644 (file)
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -6,32 +6,45 @@
 >>> 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)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> test.ex in helo_lookup_domains? no (end of list)
 >>> test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/strict
 >>> check ratelimit = 0/1h/strict

->>> ratelimit condition limit=0 period=3600 key=1h/per_mail/strict/V4NET.9.8.7
->>> ratelimit initializing new key's data
+>>> 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 db updated

->>> 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
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "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"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 46)

 >>> check ratelimit = 0/1h/per_byte/strict
 >>> 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 db updated
->>> 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
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
+>>> 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-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
+>>> processing ACL check_data "deny" (TESTSUITE/test-config 51)
+>>> deny: condition test succeeded in ACL check_data
+>>> end of ACL check_data: DENY
+LOG: 10HmaX-000000005vi-0000 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -40,30 +53,44 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> 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)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> test.ex in helo_lookup_domains? no (end of list)
 >>> test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/strict
 >>> check ratelimit = 0/1h/strict

->>> ratelimit condition limit=0 period=3600 key=1h/per_mail/strict/V4NET.9.8.7
+>>> ratelimit condition count=1 0.0/1h/per_mail/V4NET.9.8.7
+>>> ratelimit found key in database

 >>> ratelimit db updated
 >>> ratelimit db updated

->>> 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
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "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"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 46)

 >>> check ratelimit = 0/1h/per_byte/strict
 >>> check ratelimit = 0/1h/per_byte/strict

->>> ratelimit condition limit=0 period=3600 key=1h/per_byte/strict/V4NET.9.8.7
->>> ratelimit db updated
->>> 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
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
+>>> 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-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
+>>> processing ACL check_data "deny" (TESTSUITE/test-config 51)
+>>> deny: condition test succeeded in ACL check_data
+>>> end of ACL check_data: DENY
+LOG: 10HmaY-000000005vi-0000 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -72,30 +99,45 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> 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)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> test.ex in helo_lookup_domains? no (end of list)
 >>> test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/per_conn/strict
 >>> 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 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 db updated

->>> 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
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "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"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 46)

 >>> check ratelimit = 0/1h/per_conn/strict
 >>> 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
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
+>>> 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-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
+>>> processing ACL check_data "deny" (TESTSUITE/test-config 51)
+>>> deny: condition test succeeded in ACL check_data
+>>> end of ACL check_data: DENY
+LOG: 10HmaZ-000000005vi-0000 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -104,29 +146,44 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> 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)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> test.ex in helo_lookup_domains? no (end of list)
 >>> test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/per_conn/strict
 >>> check ratelimit = 0/1h/per_conn/strict

->>> ratelimit condition limit=0 period=3600 key=1h/per_conn/strict/V4NET.9.8.7
+>>> ratelimit condition count=1 0.0/1h/per_conn/V4NET.9.8.7
+>>> ratelimit found key in database

 >>> ratelimit db updated
 >>> ratelimit db updated

->>> 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
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "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"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 46)

 >>> check ratelimit = 0/1h/per_conn/strict
 >>> 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
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
+>>> 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-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h
+>>> processing ACL check_data "deny" (TESTSUITE/test-config 51)
+>>> deny: condition test succeeded in ACL check_data
+>>> end of ACL check_data: DENY
+LOG: 10HmbA-000000005vi-0000 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -135,52 +192,73 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> 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)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> test.ex in helo_lookup_domains? no (end of list)
 >>> test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/per_rcpt
 >>> check ratelimit = 0/1h/per_rcpt

->>> ratelimit condition limit=0 period=3600 key=1h/per_cmd/leaky/V4NET.9.8.7
->>> ratelimit initializing new key's data
+>>> 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 db not updated: over the limit, but leaky

->>> 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
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "accept" (TESTSUITE/test-config 28)
+>>> accept: condition test succeeded in ACL check_rcpt
+>>> end of ACL check_rcpt: ACCEPT

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/per_rcpt
 >>> check ratelimit = 0/1h/per_rcpt

->>> ratelimit condition limit=0 period=3600 key=1h/per_cmd/leaky/V4NET.9.8.7
->>> ratelimit initializing new key's data
+>>> 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 db not updated: over the limit, but leaky

->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "accept" (TESTSUITE/test-config 28)
+>>> accept: condition test succeeded in ACL check_rcpt
+>>> end of ACL check_rcpt: ACCEPT

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

->>> processing "warn"
+>>> processing ACL check_rcpt "warn" (TESTSUITE/test-config 23)

 >>> check ratelimit = 0/1h/per_rcpt
 >>> check ratelimit = 0/1h/per_rcpt

->>> ratelimit condition limit=0 period=3600 key=1h/per_cmd/leaky/V4NET.9.8.7
->>> ratelimit initializing new key's data
+>>> 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 db not updated: over the limit, but leaky

->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt "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"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 46)

 >>> check ratelimit = 0/1h/per_conn
 >>> check ratelimit = 0/1h/per_conn

->>> ratelimit condition limit=0 period=3600 key=1h/per_conn/leaky/V4NET.9.8.7
->>> ratelimit initializing new key's data
+>>> 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 db not updated: over the limit, but leaky

->>> 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
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
+>>> 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-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=3.0 sender_rate_limit=0 sender_rate_period=1h
+>>> processing ACL check_data "deny" (TESTSUITE/test-config 51)
+>>> deny: condition test succeeded in ACL check_data
+>>> end of ACL check_data: DENY
+LOG: 10HmbB-000000005vi-0000 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -189,50 +267,65 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>> 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)
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]

 >>> test.ex in helo_lookup_domains? no (end of list)
 >>> test.ex in helo_lookup_domains? no (end of list)

->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_rcpt2"
 >>> using ACL "check_rcpt2"

->>> processing "warn"
+>>> processing ACL check_rcpt2 "warn" (TESTSUITE/test-config 31)

 >>> check ratelimit = 1/1m/per_rcpt/noupdate
 >>> check ratelimit = 1/1m/per_rcpt/noupdate

->>> ratelimit condition limit=1 period=60 key=1m/per_cmd/leaky/V4NET.9.8.6
->>> ratelimit initializing new key's data
->>> ratelimit db not updated: noupdate set
+>>> 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
 >>> ratelimit computed rate 0.0

->>> warn: condition test failed
->>> processing "warn"
+>>> warn: condition test failed in ACL check_rcpt2
+>>> processing ACL check_rcpt2 "warn" (TESTSUITE/test-config 37)

 >>> check ratelimit = 1/1m/per_rcpt
 >>> check ratelimit = 1/1m/per_rcpt

->>> ratelimit condition limit=1 period=60 key=1m/per_cmd/leaky/V4NET.9.8.6
->>> ratelimit initializing new key's data
->>> ratelimit db updated
->>> ratelimit computed rate 0.0
->>> warn: condition test failed
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt2 "accept" (TESTSUITE/test-config 43)
+>>> accept: condition test succeeded in ACL check_rcpt2
+>>> end of ACL check_rcpt2: ACCEPT

 >>> using ACL "check_rcpt2"
 >>> using ACL "check_rcpt2"

->>> processing "warn"
+>>> processing ACL check_rcpt2 "warn" (TESTSUITE/test-config 31)

 >>> check ratelimit = 1/1m/per_rcpt/noupdate
 >>> check ratelimit = 1/1m/per_rcpt/noupdate

->>> ratelimit condition limit=1 period=60 key=1m/per_cmd/leaky/V4NET.9.8.6
->>> ratelimit db not updated: noupdate set
->>> ratelimit computed rate 1.0
->>> warn: condition test failed
->>> processing "warn"
+>>> 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 ACL check_rcpt2 "warn" (TESTSUITE/test-config 37)

 >>> check ratelimit = 1/1m/per_rcpt
 >>> check ratelimit = 1/1m/per_rcpt

->>> ratelimit condition limit=1 period=60 key=1m/per_cmd/leaky/V4NET.9.8.6
->>> ratelimit db updated
->>> ratelimit computed rate 1.0
->>> warn: condition test failed
->>> processing "accept"
->>> accept: condition test succeeded
+>>> 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 ACL check_rcpt2 "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"
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"

->>> processing "warn"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 46)

 >>> check ratelimit = 0/1h/per_byte/strict
 >>> check ratelimit = 0/1h/per_byte/strict

->>> ratelimit condition limit=0 period=3600 key=1h/per_byte/strict/V4NET.9.8.6
->>> ratelimit initializing new key's data
+>>> 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 db updated

->>> ratelimit computed rate 0.0
->>> warn: condition test succeeded
-LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] F=<> rejected after DATA
+>>> 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-000000005vi-0000 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
+>>> processing ACL check_data "deny" (TESTSUITE/test-config 51)
+>>> deny: condition test succeeded in ACL check_data
+>>> end of ACL check_data: DENY
+LOG: 10HmbC-000000005vi-0000 H=(test.ex) [V4NET.9.8.6] F=<> rejected after DATA