X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d945e180cbe2b26392fb21f7ae4dd2ccc603a81b..dd80338c6a23ab8a6af2875256f9077479f055b3:/test/stderr/0092

diff --git a/test/stderr/0092 b/test/stderr/0092
index b41de549f..25c32f219 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -20,31 +20,35 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] D=qqs
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 27)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> userx@test.ex in "verify@test.ex"?
 >>>  list element: verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
->>> deny: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 31)
+>>> deny: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   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
 LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex> D=qqs
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 environment after trimming:
@@ -69,16 +73,17 @@ try option message_size_limit
 host in host_lookup? no (option unset)
 set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
  ╭considering: ${if░eq░{V4NET.0.0.1}░{$sender_host_address}░{2}░{30}}s
-  ╭considering: V4NET.0.0.1}░{$sender_host_address}░{2}░{30}}s
-  ├───────text: V4NET.0.0.1
-  ├considering: }░{$sender_host_address}░{2}░{30}}s
-  ├───expanded: V4NET.0.0.1
-  ╰─────result: V4NET.0.0.1
-  ╭considering: $sender_host_address}░{2}░{30}}s
-  ├──────value: V4NET.0.0.1
-  ├considering: }░{2}░{30}}s
-  ├───expanded: $sender_host_address
-  ╰─────result: V4NET.0.0.1
+  cond: eq
+   ╭considering: V4NET.0.0.1}░{$sender_host_address}░{2}░{30}}s
+   ├───────text: V4NET.0.0.1
+   ├considering: }░{$sender_host_address}░{2}░{30}}s
+   ├───expanded: V4NET.0.0.1
+   ╰─────result: V4NET.0.0.1
+   ╭considering: $sender_host_address}░{2}░{30}}s
+   ├──────value: V4NET.0.0.1
+   ├considering: }░{2}░{30}}s
+   ├───expanded: $sender_host_address
+   ╰─────result: V4NET.0.0.1
  ├──condition: eq░{V4NET.0.0.1}░{$sender_host_address}
  ├─────result: true
   ╭considering: 2}░{30}}s
@@ -137,21 +142,21 @@ SMTP>> 250 OK
 SMTP<< rcpt to:userx@test.ex
 try option acl_smtp_rcpt
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 27)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 27)
 check hosts = :
 host in ":"?
  list element: 
 host in ":"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "deny" (TESTSUITE/test-config 28)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "deny" (TESTSUITE/test-config 28)
   message: unrouteable address
 check recipients = verify@test.ex
 userx@test.ex in "verify@test.ex"?
  list element: verify@test.ex
  address match test: subject=userx@test.ex pattern=verify@test.ex
 userx@test.ex in "verify@test.ex"? no (end of list)
-deny: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 31)
+deny: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 31)
 check domains = +local_domains
 test.ex in "+local_domains"?
  list element: +local_domains
@@ -162,8 +167,8 @@ test.ex in "+local_domains"?
   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
 SMTP>> 250 Accepted
 SMTP<< data
 try option acl_smtp_predata
@@ -190,13 +195,13 @@ exim: timed out while reading - message abandoned
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 27)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 28)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> verify@test.ex in "verify@test.ex"?
@@ -208,18 +213,21 @@ exim: timed out while reading - message abandoned
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing verify@test.ex
->>> test.ex in "! +local_domains"?
->>>  list element: ! +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+>>>  test.ex in domains? no (matched "! +local_domains")
 >>> calling forward router
 >>> forward router declined for verify@test.ex
 >>> no more routers
 >>> ----------- end verify ------------
->>> 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=(test) [V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address
 LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1] D=qqs
 An error was detected while processing a file of BSMTP input.