Transactions in retry hintsdb

[exim.git] / test / stderr / 0569

diff --git a/test/stderr/0569 b/test/stderr/0569
index 78ef6d30ff23597ce44d3706a69ff71f047fd086..8c41999d9a05c82ee82fc20b0f4723f6cbb69a7a 100644 (file)
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -2,13 +2,21 @@
 >>> 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 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?
+>>>  list element: V4NET.10.10.9

 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 recipient_unqualified_hosts? no (end of list)
 >>> 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_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex

+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex

 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)


@@ -18,6 +26,7 @@
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

+LOG: 10HmaX-000000005vi-0000 qualify/rewrite: '>' missing at end of address

 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}


@@ -26,18 +35,26 @@
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> 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 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?
+>>>  list element: V4NET.10.10.9

 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 recipient_unqualified_hosts? no (end of list)
 >>> 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_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex

+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex

 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)


@@ -53,20 +70,30 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found
+LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found

 >>> 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 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?
+>>>  list element: V4NET.10.10.9

 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 recipient_unqualified_hosts? no (end of list)
 >>> 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_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex

->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> usery@exim.test.ex in "usery@exim.test.ex"? yes (matched "usery@exim.test.ex")
+>>> usery@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  usery@exim.test.ex in "usery@exim.test.ex"? yes (matched "usery@exim.test.ex")

 >>> check set acl_m_message = I do not like your message
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
 >>> check set acl_m_message = I do not like your message
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT


@@ -80,18 +107,26 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found

 >>> 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 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?
+>>>  list element: V4NET.10.10.9

 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 recipient_unqualified_hosts? no (end of list)
 >>> 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_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex

+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex

 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)


@@ -107,18 +142,26 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbC-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found

 >>> 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 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?
+>>>  list element: V4NET.10.10.9

 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 recipient_unqualified_hosts? no (end of list)
 >>> 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_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex

+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex

 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)


@@ -136,18 +179,26 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> 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 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?
+>>>  list element: V4NET.10.10.9

 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> 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 recipient_unqualified_hosts? no (end of list)
 >>> 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_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex

+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex

 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)


@@ -165,4 +216,4 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaZ-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss