X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d5b80e59458182b2d557a929a18cb8c70cd56b68..d51dbacf4da044f797cb4c07e026adc608f1bc98:/test/stderr/0402 diff --git a/test/stderr/0402 b/test/stderr/0402 index 8d62a2ef5..6a66236d7 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -5,11 +5,6 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -DSN: r1 propagating DSN -DSN: r2 propagating DSN -DSN: r3 propagating DSN -DSN: r4 propagating DSN -DSN: r5 propagating DSN seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -76,7 +71,7 @@ Data file written for message 10HmaX-0005vi-00 }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol ╎}} (Exim $version_number) + ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) ╎ ${if def:sender_address {(envelope-from <$sender_address>) ╎ }}id $message_exim_id${if def:received_for { ╎ for $received_for}} @@ -107,18 +102,6 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ├──expanding: with $received_protocol └─────result: with local - ├──condition: def:tls_cipher - ├─────result: false - ┌───scanning: ($tls_cipher) - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_cipher) - - ├─────result: () - - └───skipping: result is not used ├──condition: def:sender_address ├─────result: true ┌considering: (envelope-from <$sender_address>) @@ -181,11 +164,6 @@ changed uid/gid: forcing real = effective configuration file is TESTSUITE/test-config trusted user admin user -DSN: r1 propagating DSN -DSN: r2 propagating DSN -DSN: r3 propagating DSN -DSN: r4 propagating DSN -DSN: r5 propagating DSN seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -208,11 +186,11 @@ recipients_count=5 **** SPOOL_IN - No additional fields **** SPOOL_IN - No additional fields body_linecount=0 message_linecount=6 -DSN: set orcpt: NULL flags: 0 -DSN: set orcpt: NULL flags: 0 -DSN: set orcpt: NULL flags: 0 -DSN: set orcpt: NULL flags: 0 -DSN: set orcpt: NULL flags: 0 +DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0 +DSN: set orcpt: flags: 0 Delivery address list: CALLER@test.ex usery@test.ex @@ -221,7 +199,7 @@ Delivery address list: rd+usery@test.ex locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory @@ -417,7 +395,7 @@ routed by r1 router transport: t1 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available @@ -445,7 +423,7 @@ search_tidyup called --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available @@ -505,7 +483,7 @@ LOG: MAIN --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available @@ -562,7 +540,7 @@ LOG: MAIN --------> CALLER@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available @@ -588,7 +566,7 @@ LOG: MAIN --------> usery@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available @@ -617,7 +595,7 @@ LOG: MAIN --------> userz@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags 0x0 +EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available @@ -722,6 +700,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>