Hintsdb transactions

[exim.git] / test / stderr / 0138

diff --git a/test/stderr/0138 b/test/stderr/0138
index f323c47a6027966c0333e81882991ed1f1fbf131..af38ad441804962f66e694a7fdd1dcd873c3e801 100644 (file)
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -6,21 +6,18 @@
 >>> 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)

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> exim.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
 >>> exim.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)

->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  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)
 >>> 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)

->>> host in tls_advertise_hosts?

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :


@@ -65,7 +62,7 @@
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -74,21 +71,18 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> 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)

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> exim.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
 >>> exim.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)

->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  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)
 >>> 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)

->>> host in tls_advertise_hosts?

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :


@@ -138,9 +132,9 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex

->>> userx in "userx"?
+>>> userx in local_parts?

 >>>  list element: userx
 >>>  list element: userx

->>>  userx in "userx"? yes (matched "userx")
+>>>  userx in local_parts? yes (matched "userx")

 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------


@@ -152,9 +146,9 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex

->>> userx in "userx"?
+>>> userx in local_parts?

 >>>  list element: userx
 >>>  list element: userx

->>>  userx in "userx"? yes (matched "userx")
+>>>  userx in local_parts? yes (matched "userx")

 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------


@@ -163,11 +157,14 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> check domains = +local_domains
 >>> exim.test.ex in "+local_domains"?
 >>>  list element: +local_domains
 >>> check domains = +local_domains
 >>> exim.test.ex in "+local_domains"?
 >>>  list element: +local_domains

->>>  exim.test.ex in "exim.test.ex"?
->>>   list element: exim.test.ex
->>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   start sublist local_domains
+>>>    exim.test.ex in "exim.test.ex"?
+>>>    ╎list element: exim.test.ex
+>>>    ╎exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'exim.test.ex' value 'exim.test.ex'

 >>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

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