X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4da19af657ed2687d20c1eb8cf85a66a70804e2d..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/0277?ds=sidebyside

diff --git a/test/stderr/0277 b/test/stderr/0277
index a71c6c862..12c462e56 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -12,8 +12,14 @@ sender_rcvhost = [V4NET.2.3.4]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.3.4]
-host in "V4NET.2.3.4"? yes (matched "V4NET.2.3.4")
-host in host_lookup? yes (matched "+lookup_hosts")
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
+   ╎host in "V4NET.2.3.4"? yes (matched "V4NET.2.3.4")
+  end sublist lookup_hosts
+  host in host_lookup? yes (matched "+lookup_hosts")
 looking up host name for V4NET.2.3.4
 DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
@@ -27,8 +33,11 @@ sender_fullhost = [V4NET.2.3.4]
 sender_rcvhost = [V4NET.2.3.4]
 set_process_info: pppp handling incoming connection from [V4NET.2.3.4]
 host in host_reject_connection? no (option unset)
-cached yes match for +lookup_hosts
-host in sender_unqualified_hosts? yes (matched "+lookup_hosts" - cached)
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached yes match for +lookup_hosts
+  host in sender_unqualified_hosts? yes (matched "+lookup_hosts" - cached)
 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)
@@ -38,7 +47,7 @@ smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [V4NET.2.3.4] closed by QUIT
+  SMTP connection from [V4NET.2.3.4] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -55,14 +64,38 @@ sender_rcvhost = [V4NET.6.7.8]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.6.7.8]
-host in "V4NET.2.3.4"? no (end of list)
-host in "V4NET.6.7.8"? yes (matched "V4NET.6.7.8")
-host in host_lookup? no (matched "!+never_hosts")
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
+  host in "V4NET.2.3.4"? no (end of list)
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
+   ╎host in "V4NET.6.7.8"? yes (matched "V4NET.6.7.8")
+  end sublist never_hosts
+  host in host_lookup? no (matched "!+never_hosts")
 set_process_info: pppp handling incoming connection from [V4NET.6.7.8]
 host in host_reject_connection? no (option unset)
-cached no match for +lookup_hosts
-host in "V4NET.1.1.1"? no (end of list)
-host in "<; V4NET.2.2.2 ; +n1_hosts"? no (end of list)
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎list element: +n1_hosts
+   ╎ start sublist n1_hosts
+   ╎  host in "V4NET.1.1.1"?
+   ╎   list element: V4NET.1.1.1
+   ╎  host in "V4NET.1.1.1"? no (end of list)
+   ╎ end sublist n1_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"? no (end of list)
+  end sublist n2_hosts
 host in sender_unqualified_hosts? yes (end of list)
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
@@ -73,7 +106,7 @@ smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [V4NET.6.7.8] closed by QUIT
+  SMTP connection from [V4NET.6.7.8] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -90,8 +123,19 @@ sender_rcvhost = [V4NET.10.11.12]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.10.11.12]
-host in "V4NET.2.3.4"? no (end of list)
-host in "V4NET.6.7.8"? no (end of list)
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
+  host in "V4NET.2.3.4"? no (end of list)
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
+  host in "V4NET.6.7.8"? no (end of list)
+  end sublist never_hosts
 host in host_lookup? yes (end of list)
 looking up host name for V4NET.10.11.12
 DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) using fakens
@@ -106,9 +150,22 @@ sender_fullhost = [V4NET.10.11.12]
 sender_rcvhost = [V4NET.10.11.12]
 set_process_info: pppp handling incoming connection from [V4NET.10.11.12]
 host in host_reject_connection? no (option unset)
-cached no match for +lookup_hosts
-host in "V4NET.1.1.1"? no (end of list)
-host in "<; V4NET.2.2.2 ; +n1_hosts"? no (end of list)
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎list element: +n1_hosts
+   ╎ start sublist n1_hosts
+   ╎  host in "V4NET.1.1.1"?
+   ╎   list element: V4NET.1.1.1
+   ╎  host in "V4NET.1.1.1"? no (end of list)
+   ╎ end sublist n1_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"? no (end of list)
+  end sublist n2_hosts
 host in sender_unqualified_hosts? yes (end of list)
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
@@ -119,7 +176,7 @@ smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [V4NET.10.11.12] closed by QUIT
+  SMTP connection from [V4NET.10.11.12] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -136,8 +193,19 @@ sender_rcvhost = [V4NET.1.1.1]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.1.1.1]
-host in "V4NET.2.3.4"? no (end of list)
-host in "V4NET.6.7.8"? no (end of list)
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
+  host in "V4NET.2.3.4"? no (end of list)
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
+  host in "V4NET.6.7.8"? no (end of list)
+  end sublist never_hosts
 host in host_lookup? yes (end of list)
 looking up host name for V4NET.1.1.1
 DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) using fakens
@@ -152,10 +220,23 @@ sender_fullhost = [V4NET.1.1.1]
 sender_rcvhost = [V4NET.1.1.1]
 set_process_info: pppp handling incoming connection from [V4NET.1.1.1]
 host in host_reject_connection? no (option unset)
-cached no match for +lookup_hosts
-host in "V4NET.1.1.1"? yes (matched "V4NET.1.1.1")
-host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "+n1_hosts")
-host in sender_unqualified_hosts? no (matched "!+n2_hosts")
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎list element: +n1_hosts
+   ╎ start sublist n1_hosts
+   ╎  host in "V4NET.1.1.1"?
+   ╎   list element: V4NET.1.1.1
+   ╎   host in "V4NET.1.1.1"? yes (matched "V4NET.1.1.1")
+   ╎ end sublist n1_hosts
+   ╎host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "+n1_hosts")
+  end sublist n2_hosts
+  host in sender_unqualified_hosts? no (matched "!+n2_hosts")
 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)
@@ -165,7 +246,7 @@ smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [V4NET.1.1.1] closed by QUIT
+  SMTP connection from [V4NET.1.1.1] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -182,8 +263,19 @@ sender_rcvhost = [V4NET.2.2.2]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.2.2]
-host in "V4NET.2.3.4"? no (end of list)
-host in "V4NET.6.7.8"? no (end of list)
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
+  host in "V4NET.2.3.4"? no (end of list)
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
+  host in "V4NET.6.7.8"? no (end of list)
+  end sublist never_hosts
 host in host_lookup? yes (end of list)
 looking up host name for V4NET.2.2.2
 DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) using fakens
@@ -198,9 +290,17 @@ sender_fullhost = [V4NET.2.2.2]
 sender_rcvhost = [V4NET.2.2.2]
 set_process_info: pppp handling incoming connection from [V4NET.2.2.2]
 host in host_reject_connection? no (option unset)
-cached no match for +lookup_hosts
-host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "V4NET.2.2.2")
-host in sender_unqualified_hosts? no (matched "!+n2_hosts")
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "V4NET.2.2.2")
+  end sublist n2_hosts
+  host in sender_unqualified_hosts? no (matched "!+n2_hosts")
 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)
@@ -210,6 +310,6 @@ smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [V4NET.2.2.2] closed by QUIT
+  SMTP connection from [V4NET.2.2.2] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>