Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0243

diff --git a/test/stderr/0243 b/test/stderr/0243
index 59571b868696b4eda85df3801bdb20d583cbb63c..c92fc3e09df3e3e48f9c40db089b43d40c9be878 100644 (file)
--- a/test/stderr/0243
+++ b/test/stderr/0243
@@ -6,13 +6,17 @@
 >>> 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)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> xxxx in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> xxxx in helo_lookup_domains? no (end of list)
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> 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)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
@@ -20,23 +24,30 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing faq@nl.demon.net
->>> list element: *.demon.net
->>> nl.demon.net in "*.demon.net"? yes (matched "*.demon.net")
+>>> nl.demon.net in domains?
+>>>  list element: *.demon.net
+>>>  nl.demon.net in domains? yes (matched "*.demon.net")
 >>> calling auto_antwoord router
 >>> routed by auto_antwoord router (unseen)
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing faq@nl.demon.net
->>> list element: nl.demon.net
->>> nl.demon.net in "nl.demon.net:*.nl.demon.net:fax-gw.demon.nl: www-3.demon.nl : localhost"? yes (matched "nl.demon.net")
+>>> nl.demon.net in domains?
+>>>  list element: nl.demon.net
+>>>  nl.demon.net in domains? yes (matched "nl.demon.net")
 >>> calling algemeen_aliases router
 >>> routed by algemeen_aliases router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: nl.demon.net
->>> nl.demon.net in "nl.demon.net"? yes (matched "nl.demon.net")
->>> nl.demon.net in "+local_domains"? yes (matched "+local_domains")
+>>> nl.demon.net in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    nl.demon.net in "nl.demon.net"?
+>>>    ╎list element: nl.demon.net
+>>>    ╎nl.demon.net in "nl.demon.net"? yes (matched "nl.demon.net")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'nl.demon.net' value 'nl.demon.net'
+>>>  nl.demon.net in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT