X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d5c0d8c9374623620844d539d4810da63e9abca1..6aac3239b4ce9638c2c5647684dc4ff2a6afbb42:/test/stderr/5204 diff --git a/test/stderr/5204 b/test/stderr/5204 index 32754009b..38f568d23 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 <-------- @@ -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] @@ -299,4 +263,4 @@ 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) 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 >>>>>>>>>>>>>>>>