Merge branch 'master' into 4.next

[exim.git] / test / stderr / 5204

diff --git a/test/stderr/5204 b/test/stderr/5204
index 6f3c13e1088ba0269797987c3fd8f83f4fde3c1d..d2f5482588c330c201d5b02cb96d922cc75401ed 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -1,6 +1,7 @@
 LOG: MAIN
   remote host address is the local host: some.host (while routing <"ACCEPT hosts=localhost lookup=byname"@some.host>)
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -9,10 +10,14 @@ routing "DECLINE cannot route this one (DECLINE)"@some.host
 --------> b router <--------
 local_part=decline cannot route this one (decline) domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=DECLINE cannot route this one (DECLINE) domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "DECLINE cannot route this one (DECLINE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -22,6 +27,7 @@ q router declined for "DECLINE cannot route this one (DECLINE)"@some.host
 no more routers
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -30,10 +36,14 @@ routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -41,6 +51,7 @@ command wrote: FAIL cannot route this one (FAIL)
 q router forced address failure
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -49,10 +60,14 @@ routing "ERROR cannot route this one (ERROR)"@some.host
 --------> b router <--------
 local_part=error cannot route this one (error) domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=ERROR cannot route this one (ERROR) domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "ERROR cannot route this one (ERROR)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -63,6 +78,7 @@ q router: defer for "ERROR cannot route this one (ERROR)"@some.host
   message: bad command yield: ERROR cannot route this one (ERROR)
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -71,10 +87,14 @@ routing "DEFER cannot route this one (DEFER)"@some.host
 --------> b router <--------
 local_part=defer cannot route this one (defer) domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=DEFER cannot route this one (DEFER) domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "DEFER cannot route this one (DEFER)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -83,6 +103,7 @@ q router: defer for "DEFER cannot route this one (DEFER)"@some.host
   message: cannot route this one (DEFER)
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -91,10 +112,14 @@ routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
 --------> b router <--------
 local_part=accept transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=ACCEPT transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -111,6 +136,7 @@ routed by q router
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -119,10 +145,14 @@ routing PASS@some.host
 --------> b router <--------
 local_part=pass domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=PASS domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for PASS@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -131,6 +161,7 @@ q router passed for PASS@some.host
 --------> s router <--------
 local_part=pass domain=some.host
 checking domains
+some.host in domains? yes (end of list)
 calling s router
 s router called for PASS@some.host
   domain = some.host
@@ -151,6 +182,7 @@ routed by s router
   host 127.0.0.1 [127.0.0.1]
 >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -159,10 +191,14 @@ routing "FREEZE cannot route this one (FREEZE)"@some.host
 --------> b router <--------
 local_part=freeze cannot route this one (freeze) domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FREEZE cannot route this one (FREEZE) domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "FREEZE cannot route this one (FREEZE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -171,6 +207,7 @@ q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
   message: cannot route this one (FREEZE)
 >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -179,10 +216,14 @@ routing "REDIRECT postmaster@test.ex"@some.host
 --------> b router <--------
 local_part=redirect postmaster@test.ex domain=some.host
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=REDIRECT postmaster@test.ex domain=some.host
 checking domains
+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)
 calling q router
 q router called for "REDIRECT postmaster@test.ex"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
@@ -201,6 +242,8 @@ routing postmaster@test.ex
 --------> b router <--------
 local_part=postmaster domain=test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=postmaster domain=test.ex
@@ -226,6 +269,7 @@ routed by pm router
   transport: null
 >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 host in hosts_connection_nolog? no (option unset)
@@ -257,21 +301,23 @@ routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders
-x@y in ":"?
+x@y in senders?
  list element: 
  y in ""?
  y in ""? no (end of list)
-x@y in ":"? no (end of list)
+x@y in senders? no (end of list)
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
-some.host in "! +local_domains"?
- list element: ! +local_domains
- some.host in "test.ex"?
-  list element: test.ex
- some.host in "test.ex"? no (end of list)
-some.host in "! +local_domains"? yes (end of list)
+some.host in domains?
+ list element: !░+local_domains
+  start sublist local_domains
+   some.host in "test.ex"?
+   ╎list element: test.ex
+   some.host in "test.ex"? no (end of list)
+  end sublist local_domains
+some.host in domains? yes (end of list)
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=CALLER_UID gid=CALLER_GID current_directory=/