X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a1bccd48f3956b50a13a34f5aed4b72c658c61af..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/stderr/0089?ds=sidebyside

diff --git a/test/stderr/0089 b/test/stderr/0089
index 213760dae..107944c7f 100644
--- a/test/stderr/0089
+++ b/test/stderr/0089
@@ -1,97 +1,169 @@
 >>> 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?
+>>>  list element: *N-99.test.EX
 >>> sender host name required, to match against *N-99.test.EX
 >>> looking up host name for V4NET.0.0.0
 LOG: no host name found for IP address V4NET.0.0.0
->>> host in sender_unqualified_hosts? no (failed to find host name for V4NET.0.0.0)
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
+>>>  host in sender_unqualified_hosts? no (failed to find host name for V4NET.0.0.0)
+>>>  host in recipient_unqualified_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?
+>>>   list element: *N-99.test.ex
 >>> sender host name required, to match against *N-99.test.ex
->>> host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0)
+>>>   host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0)
 LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&*()
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> abc_xyz in helo_lookup_domains? no (end of list)
->>> 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
->>> test.ex in "Test.ex : myhost.test.EX"? yes (matched "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
->>> 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
->>> else.where in "Test.ex : myhost.test.EX"? no (end of list)
->>> else.where in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
->>> check domains = +relay_domains
->>> else.where in "Test.ex : Relay.one.ex"? no (end of list)
->>> else.where in "+relay_domains"? 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"
->>> end of ACL "check_recipient": DENY
+>>>   host in smtp_accept_max_nonmail_hosts?
+>>>    list element: *
+>>>    host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>>   abc_xyz in helo_lookup_domains?
+>>>    list element: @
+>>>    list element: @[]
+>>>   abc_xyz in helo_lookup_domains? no (end of list)
+>>>   using ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 24)
+>>>   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 25)
+>>>   check domains = +local_domains
+>>>   test.ex in "+local_domains"?
+>>>    list element: +local_domains
+>>>     start sublist local_domains
+>>>    ╎ test.ex in "Test.ex : myhost.test.EX"?
+>>>    ╎  list element: Test.ex
+>>>    ╎  test.ex in "Test.ex : myhost.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
+>>>   using ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 24)
+>>>   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 25)
+>>>   check domains = +local_domains
+>>>   else.where in "+local_domains"?
+>>>    list element: +local_domains
+>>>     start sublist local_domains
+>>>    ╎ else.where in "Test.ex : myhost.test.EX"?
+>>>    ╎  list element: Test.ex
+>>>    ╎  list element: myhost.test.EX
+>>>    ╎ else.where in "Test.ex : myhost.test.EX"? no (end of list)
+>>>     end sublist local_domains
+>>>   else.where in "+local_domains"? no (end of list)
+>>>   accept: condition test failed in ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 26)
+>>>   check domains = +relay_domains
+>>>   else.where in "+relay_domains"?
+>>>    list element: +relay_domains
+>>>     start sublist relay_domains
+>>>    ╎ else.where in "Test.ex : Relay.one.ex"?
+>>>    ╎  list element: Test.ex
+>>>    ╎  list element: Relay.one.ex
+>>>    ╎ else.where in "Test.ex : Relay.one.ex"? no (end of list)
+>>>     end sublist relay_domains
+>>>   else.where in "+relay_domains"? no (end of list)
+>>>   accept: condition test failed in ACL "check_recipient"
+>>>   processing "deny" (TESTSUITE/test-config 27)
+>>>     message: relay not permitted
+>>>   deny: condition test succeeded in ACL "check_recipient"
+>>>   end of ACL "check_recipient": DENY
 LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else.where>: relay not permitted
 >>> 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?
+>>>  list element: *N-99.test.EX
 >>> sender host name required, to match against *N-99.test.EX
 >>> looking up host name for V4NET.0.0.99
->>> IP address lookup yielded ten-99.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-99.test.ex address=V4NET.0.0.99
+>>> IP address lookup yielded "ten-99.test.ex"
+>>>   check dnssec require list
+>>>    ten-99.test.ex not in empty list (option unset? cannot trace name)
+>>>   check dnssec request list
+>>>    ten-99.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-99.test.ex
 >>>   V4NET.0.0.99 OK
->>> host in sender_unqualified_hosts? yes (matched "*N-99.test.EX")
+>>>  host in sender_unqualified_hosts? yes (matched "*N-99.test.EX")
 >>> host in recipient_unqualified_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? yes (matched "*N-99.test.ex")
+>>> host in helo_accept_junk_hosts?
+>>>  list element: *N-99.test.ex
+>>>  host in helo_accept_junk_hosts? yes (matched "*N-99.test.ex")
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> 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 25)
 >>> check domains = +local_domains
->>> relay.one.ex in "Test.ex : myhost.test.EX"? no (end of list)
+>>> relay.one.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    relay.one.ex in "Test.ex : myhost.test.EX"?
+>>>    ╎list element: Test.ex
+>>>    ╎list element: myhost.test.EX
+>>>    relay.one.ex in "Test.ex : myhost.test.EX"? no (end of list)
+>>>   end sublist local_domains
 >>> relay.one.ex in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 26)
 >>> check domains = +relay_domains
->>> relay.one.ex in "Test.ex : Relay.one.ex"? yes (matched "Relay.one.ex")
->>> relay.one.ex in "+relay_domains"? yes (matched "+relay_domains")
+>>> relay.one.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>   start sublist relay_domains
+>>>    relay.one.ex in "Test.ex : Relay.one.ex"?
+>>>    ╎list element: Test.ex
+>>>    ╎list element: Relay.one.ex
+>>>    ╎relay.one.ex in "Test.ex : Relay.one.ex"? yes (matched "Relay.one.ex")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'relay.one.ex' value 'Relay.one.ex'
+>>>  relay.one.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> 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 25)
 >>> check domains = +local_domains
->>> relay.two.ex in "Test.ex : myhost.test.EX"? no (end of list)
+>>> relay.two.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    relay.two.ex in "Test.ex : myhost.test.EX"?
+>>>    ╎list element: Test.ex
+>>>    ╎list element: myhost.test.EX
+>>>    relay.two.ex in "Test.ex : myhost.test.EX"? no (end of list)
+>>>   end sublist local_domains
 >>> relay.two.ex in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 26)
 >>> check domains = +relay_domains
->>> relay.two.ex in "Test.ex : Relay.one.ex"? no (end of list)
+>>> relay.two.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>   start sublist relay_domains
+>>>    relay.two.ex in "Test.ex : Relay.one.ex"?
+>>>    ╎list element: Test.ex
+>>>    ╎list element: Relay.one.ex
+>>>    relay.two.ex in "Test.ex : Relay.one.ex"? no (end of list)
+>>>   end sublist relay_domains
 >>> relay.two.ex in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 27)
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY