X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..6d01ba2d553fd57630e14aba83001e7111c80857:/test/stderr/0306

diff --git a/test/stderr/0306 b/test/stderr/0306
index 26850055f..b2d3b50b3 100644
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -6,8 +6,6 @@
 >>> 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: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -17,24 +15,24 @@
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1-request@lists.test.ex
->>> lists.test.ex in "lists.test.ex"?
+>>> lists.test.ex in domains?
 >>>  list element: lists.test.ex
->>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
 >>> calling r1 router
 >>> routed by r1 router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing manager-list1@test.ex
->>> test.ex in "lists.test.ex"?
+>>> test.ex in domains?
 >>>  list element: lists.test.ex
->>> test.ex in "lists.test.ex"? no (end of list)
->>> test.ex in "lists.test.ex"?
+>>> test.ex in domains? no (end of list)
+>>> test.ex in domains?
 >>>  list element: lists.test.ex
->>> test.ex in "lists.test.ex"? no (end of list)
->>> anyone@anywhere in ":"?
+>>> test.ex in domains? no (end of list)
+>>> anyone@anywhere in senders?
 >>>  list element: 
 >>>  anywhere in ""?
 >>>  anywhere in ""? no (end of list)
->>> anyone@anywhere in ":"? no (end of list)
+>>> anyone@anywhere in senders? no (end of list)
 >>> calling r5 router
 >>> routed by r5 router
 >>> ----------- end verify ------------
@@ -45,12 +43,12 @@
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
->>> lists.test.ex in "lists.test.ex"?
+>>> lists.test.ex in domains?
 >>>  list element: lists.test.ex
->>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> sub1@test.ex in "lsearch;TESTSUITE/aux-fixed/0306/list1"?
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
+>>> sub1@test.ex in senders?
 >>>  list element: lsearch;TESTSUITE/aux-fixed/0306/list1
->>>  sub1@test.ex in "lsearch;TESTSUITE/aux-fixed/0306/list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0306/list1")
+>>>  sub1@test.ex in senders? yes (matched "lsearch;TESTSUITE/aux-fixed/0306/list1")
 >>> calling r2 router
 >>> routed by r2 router
 >>> ----------- end verify ------------
@@ -64,15 +62,15 @@
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
->>> lists.test.ex in "lists.test.ex"?
+>>> lists.test.ex in domains?
 >>>  list element: lists.test.ex
->>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> anyone@anywhere in "lsearch;TESTSUITE/aux-fixed/0306/list1"?
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
+>>> anyone@anywhere in senders?
 >>>  list element: lsearch;TESTSUITE/aux-fixed/0306/list1
->>> anyone@anywhere in "lsearch;TESTSUITE/aux-fixed/0306/list1"? no (end of list)
->>> lists.test.ex in "lists.test.ex"?
+>>> anyone@anywhere in senders? no (end of list)
+>>> lists.test.ex in domains?
 >>>  list element: lists.test.ex
->>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------
@@ -84,20 +82,20 @@ LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>:
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing nonlist@lists.test.ex
->>> lists.test.ex in "lists.test.ex"?
+>>> lists.test.ex in domains?
 >>>  list element: lists.test.ex
->>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> anyone@anywhere in "*"?
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
+>>> anyone@anywhere in senders?
 >>>  list element: *
 >>>  anywhere in "*"?
 >>>   list element: *
 >>>   anywhere in "*"? yes (matched "*")
->>>  anyone@anywhere in "*"? yes (matched "*")
+>>>  anyone@anywhere in senders? yes (matched "*")
 >>> calling r2 router
 >>> r2 router declined for nonlist@lists.test.ex
->>> lists.test.ex in "lists.test.ex"?
+>>> lists.test.ex in domains?
 >>>  list element: lists.test.ex
->>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------