X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/44bc8f0c2f3576b46bd6df1b818cb29eaf84df5b..b4a37a77271a8f6efc887d68265eb7867eff6170:/test/stderr/5204?ds=inline diff --git a/test/stderr/5204 b/test/stderr/5204 index e1ed340c0..dd2862b78 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -3,10 +3,6 @@ LOG: MAIN Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "DECLINE cannot route this one (DECLINE)"@some.host --------> b router <-------- @@ -23,14 +19,10 @@ command wrote: DECLINE cannot route this one (DECLINE) q router declined for "DECLINE cannot route this one (DECLINE)"@some.host "more" is false: skipping remaining routers no more routers ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "FAIL cannot route this one (FAIL)"@some.host --------> b router <-------- @@ -45,14 +37,10 @@ q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some requires uid=EXIM_UID gid=EXIM_GID current_directory=/ command wrote: FAIL cannot route this one (FAIL) q router forced address failure ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "ERROR cannot route this one (ERROR)"@some.host --------> b router <-------- @@ -70,14 +58,10 @@ LOG: PANIC q router: bad command yield: ERROR cannot route this one (ERROR) q router: defer for "ERROR cannot route this one (ERROR)"@some.host message: bad command yield: ERROR cannot route this one (ERROR) ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "DEFER cannot route this one (DEFER)"@some.host --------> b router <-------- @@ -93,14 +77,10 @@ requires uid=EXIM_UID gid=EXIM_GID current_directory=/ command wrote: DEFER cannot route this one (DEFER) q router: defer for "DEFER cannot route this one (DEFER)"@some.host message: cannot route this one (DEFER) ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host --------> b router <-------- @@ -124,14 +104,10 @@ routed by q router envelope to: "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host transport: other_smtp host ten-1.test.ex [V4NET.0.0.1] ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing PASS@some.host --------> b router <-------- @@ -153,8 +129,8 @@ calling s router s router called for PASS@some.host domain = some.host route_item = * 127.0.0.1 byname -original list of hosts = "127.0.0.1" options = byname -expanded list of hosts = "127.0.0.1" options = byname +original list of hosts = '127.0.0.1' options = 'byname' +expanded list of hosts = '127.0.0.1' options = 'byname' set transport smtp finding IP address for 127.0.0.1 calling host_find_byname @@ -167,14 +143,10 @@ routed by s router envelope to: PASS@some.host transport: smtp host 127.0.0.1 [127.0.0.1] ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "FREEZE cannot route this one (FREEZE)"@some.host --------> b router <-------- @@ -190,14 +162,10 @@ requires uid=EXIM_UID gid=EXIM_GID current_directory=/ command wrote: FREEZE cannot route this one (FREEZE) q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host message: cannot route this one (FREEZE) ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing "REDIRECT postmaster@test.ex"@some.host --------> b router <-------- @@ -248,14 +216,10 @@ domain = test.ex routed by pm router envelope to: postmaster@test.ex transport: null ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: b propagating DSN -DSN: q propagating DSN -DSN: s propagating DSN -DSN: pm propagating DSN host in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from [V4NET.2.3.4] @@ -273,30 +237,30 @@ host in chunking_advertise_hosts? no (end of list) processing "accept" check verify = recipient >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -routing "FAIL cannot route this one=(FAIL)"@some.host +routing "FAIL cannot route this one (FAIL)"@some.host --------> b router <-------- -local_part=fail cannot route this one=(fail) domain=some.host +local_part=fail cannot route this one (fail) domain=some.host checking senders y in ""? no (end of list) x@y in ":"? no (end of list) b router skipped: senders mismatch --------> q router <-------- -local_part=FAIL cannot route this one=(FAIL) domain=some.host +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 "! +local_domains"? yes (end of list) calling q router -q router called for "FAIL cannot route this one=(FAIL)"@some.host: domain = some.host +q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host requires uid=CALLER_UID gid=CALLER_GID current_directory=/ not running as root: cannot change uid/gid subprocess will run with uid=EXIM_UID gid=EXIM_GID -command wrote: FAIL cannot route this one=(FAIL) +command wrote: FAIL cannot route this one (FAIL) q router forced address failure ----------- end verify ------------ accept: condition test failed in inline ACL end of inline ACL: implicit DENY LOG: MAIN REJECT - H=(some.name) [V4NET.2.3.4] F= rejected RCPT <"FAIL cannot route this one=(FAIL)"@some.host>: cannot route this one=(FAIL) + H=(some.name) [V4NET.2.3.4] F= rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL) LOG: smtp_connection MAIN SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>