Fix 2-phase, in-order queue run delivery order

[exim.git] / test / stderr / 0124

diff --git a/test/stderr/0124 b/test/stderr/0124
index 328d78084840470522e370fea2f613090620c2a3..7d39831317bbfbe6f2f406de672000905e87b82c 100644 (file)
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -6,43 +6,76 @@
 >>> 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 in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 21)
 >>> check domains = +local_domains
->>> external.test.ex in "test.ex"? no (end of list)
+>>> external.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    external.test.ex in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    external.test.ex in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> external.test.ex in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> check hosts = +relay_hosts
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>   start sublist relay_hosts
+>>>    host in "*.friendly.test.ex"?
+>>>    ╎list element: *.friendly.test.ex
 >>> sender host name required, to match against *.friendly.test.ex
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
->>> host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
->>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny"
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
-LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
->>> using ACL "check_recipient"
->>> processing "accept"
->>> check hosts = :
->>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
->>> check domains = +local_domains
->>> external.test.ex in "test.ex"? no (end of list)
->>> external.test.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
->>> check hosts = +relay_hosts
->>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny"
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
-LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
+>>>    ╎host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
+>>>    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 23)
+>>>    message: relay not permitted
+>>>  deny: condition test succeeded in ACL "check_recipient"
+>>>  end of ACL "check_recipient": DENY
+LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
+>>>  using ACL "check_recipient"
+>>>  processing "accept" (TESTSUITE/test-config 20)
+>>>  check hosts = :
+>>>  host in ":"?
+>>>   list element: 
+>>>  host in ":"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "accept" (TESTSUITE/test-config 21)
+>>>  check domains = +local_domains
+>>>  external.test.ex in "+local_domains"?
+>>>   list element: +local_domains
+>>>    start sublist local_domains
+>>>    ╎external.test.ex in "test.ex"?
+>>>    ╎ list element: test.ex
+>>>    ╎external.test.ex in "test.ex"? no (end of list)
+>>>    end sublist local_domains
+>>>  external.test.ex in "+local_domains"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "accept" (TESTSUITE/test-config 22)
+>>>  check hosts = +relay_hosts
+>>>  host in "+relay_hosts"?
+>>>   list element: +relay_hosts
+>>>    start sublist relay_hosts
+>>>   cached no match for +relay_hosts
+>>>   cached lookup data = NULL
+>>>  host in "+relay_hosts"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "deny" (TESTSUITE/test-config 23)
+>>>    message: relay not permitted
+>>>  deny: condition test succeeded in ACL "check_recipient"
+>>>  end of ACL "check_recipient": DENY
+LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted