Call notquite ACL for synprot-error limit. Bug 3092

[exim.git] / test / stderr / 0062

diff --git a/test/stderr/0062 b/test/stderr/0062
index 386a2294b539ff72997ed04706ef87783b0c8bce..045586404d0ed5bf8ef836220eb9fddfdbd665ea 100644 (file)
--- a/test/stderr/0062
+++ b/test/stderr/0062
@@ -11,7 +11,7 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -22,10 +22,10 @@
 >>>   end sublist local_domains
 >>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
@@ -36,8 +36,8 @@
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check domains = +relay_domains
 >>> anotherhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
@@ -47,35 +47,37 @@
 >>>    anotherhost.example.com in "test.ex"? no (end of list)
 >>>   end sublist relay_domains
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.test.ex
->>> sender host name required, to match against *-2.test.ex
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>    ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>    ╎sender host name required, to match against *-2.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.1
+>>>    ╎  IP address lookup yielded "ten-1.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>>    ╎list element: *-3-alias.test.ex
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"? no (end of list)
 >>>   end sublist relay_hosts
 >>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 26)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 26)
 >>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>> deny: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: DENY
 LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 >>> using ACL "check_message"
->>> processing "accept" (TESTSUITE/test-config 29)
->>> accept: condition test succeeded in ACL "check_message"
->>> end of ACL "check_message": ACCEPT
+>>> processing ACL check_message "accept" (TESTSUITE/test-config 29)
+>>> accept: condition test succeeded in ACL check_message
+>>> end of ACL check_message: ACCEPT
 LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -90,7 +92,7 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -101,10 +103,10 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>   end sublist local_domains
 >>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
@@ -115,8 +117,8 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check domains = +relay_domains
 >>> anotherhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
@@ -126,31 +128,33 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>    anotherhost.example.com in "test.ex"? no (end of list)
 >>>   end sublist relay_domains
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.test.ex
->>> sender host name required, to match against *-2.test.ex
->>> looking up host name for V4NET.0.0.2
->>> IP address lookup yielded "ten-2.test.ex"
->>>    ╎ten-2.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ten-2.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-2.test.ex
+>>>    ╎sender host name required, to match against *-2.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.2
+>>>    ╎  IP address lookup yielded "ten-2.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-2.test.ex
 >>>   V4NET.0.0.2 OK
 >>>    ╎host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-2.test.ex")
 >>>   end sublist relay_hosts
 >>>  data from lookup saved for cache for +relay_hosts: key 'V4NET.0.0.2' value '*-2.test.ex'
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> using ACL "check_message"
->>> processing "accept" (TESTSUITE/test-config 29)
->>> accept: condition test succeeded in ACL "check_message"
->>> end of ACL "check_message": ACCEPT
+>>> processing ACL check_message "accept" (TESTSUITE/test-config 29)
+>>> accept: condition test succeeded in ACL check_message
+>>> end of ACL check_message: ACCEPT
 LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -165,7 +169,7 @@ LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -176,10 +180,10 @@ LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test
 >>>   end sublist local_domains
 >>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
@@ -190,8 +194,8 @@ LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check domains = +relay_domains
 >>> anotherhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
@@ -201,35 +205,39 @@ LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test
 >>>    anotherhost.example.com in "test.ex"? no (end of list)
 >>>   end sublist relay_domains
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.test.ex
->>> sender host name required, to match against *-2.test.ex
->>> looking up host name for V4NET.0.0.3
->>> IP address lookup yielded "ten-3.test.ex"
->>>   alias "ten-3-alias.test.ex"
->>>    ╎ten-3.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ten-3.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-3.test.ex
+>>>    ╎sender host name required, to match against *-2.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.3
+>>>    ╎  IP address lookup yielded "ten-3.test.ex"
+>>>    ╎    alias "ten-3-alias.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-3.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-3.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-3.test.ex
 >>>   V4NET.0.0.3 OK
->>>    ╎ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-3-alias.test.ex
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-3-alias.test.ex
 >>>   V4NET.0.0.3 OK
 >>>    ╎list element: *-3-alias.test.ex
 >>>    ╎host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-3-alias.test.ex")
 >>>   end sublist relay_hosts
 >>>  data from lookup saved for cache for +relay_hosts: key 'V4NET.0.0.3' value '*-3-alias.test.ex'
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> using ACL "check_message"
->>> processing "accept" (TESTSUITE/test-config 29)
->>> accept: condition test succeeded in ACL "check_message"
->>> end of ACL "check_message": ACCEPT
+>>> processing ACL check_message "accept" (TESTSUITE/test-config 29)
+>>> accept: condition test succeeded in ACL check_message
+>>> end of ACL check_message: ACCEPT
 LOG: 10HmaZ-000000005vi-0000 <= userx@somehost.example.com H=ten-3.test.ex (test) [V4NET.0.0.3] P=smtp S=sss