X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/46d2a5e6f6e7709d172903b13945d23fc0a2c888..3bc5af4b43dd07dc06c546bf0b402760f79f7710:/test/stderr/0402?ds=sidebyside diff --git a/test/stderr/0402 b/test/stderr/0402 index 4a70c7308..a87765c45 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -110,16 +110,6 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -151,22 +141,16 @@ Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 + id 10HmaX-0005vi-00; + Tue, 2 Mar 1999 09:44:33 +0000 ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -DSN: Flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss @@ -174,10 +158,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -fresh-exec forking for local-accept-delivery -postfork: local-accept-delivery exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -199,7 +180,7 @@ reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: -Empty Tree + Empty Tree ---- End of tree ---- recipients_count=5 **** SPOOL_IN - No additional fields @@ -207,7 +188,7 @@ recipients_count=5 **** SPOOL_IN - No additional fields **** SPOOL_IN - No additional fields **** SPOOL_IN - No additional fields -body_linecount=0 message_linecount=6 +body_linecount=0 message_linecount=7 DSN: set orcpt: flags: 0x0 DSN: set orcpt: flags: 0x0 DSN: set orcpt: flags: 0x0 @@ -223,8 +204,7 @@ Delivery address list: locked TESTSUITE/spool/db/retry.lockfile 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 + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@test.ex @@ -369,7 +349,7 @@ set transport t2 queued for t2 transport: local_part = userz domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=userz routed by r3 router envelope to: userz@test.ex transport: t2 @@ -395,7 +375,7 @@ set transport t1 queued for t1 transport: local_part = usery domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=usery routed by r2 router envelope to: usery@test.ex transport: t1 @@ -416,7 +396,7 @@ set transport t1 queued for t1 transport: local_part = CALLER domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=CALLER routed by r1 router envelope to: CALLER@test.ex transport: t1 @@ -459,8 +439,6 @@ no retry data available ╰─────result: /non-exist/usery ╰──(tainted) search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/usery current=/ @@ -505,7 +483,6 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling TESTSUITE/test-mail/junk:rd+usery@test.ex ft1 transport returned OK for TESTSUITE/test-mail/junk post-process TESTSUITE/test-mail/junk (0) @@ -521,8 +498,6 @@ LOG: MAIN failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/CALLER current=/ @@ -567,7 +542,6 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling TESTSUITE/test-mail/junk:rd+CALLER@test.ex ft1 transport returned OK for TESTSUITE/test-mail/junk post-process TESTSUITE/test-mail/junk (0) @@ -583,8 +557,6 @@ LOG: MAIN failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local changed uid/gid: local delivery to CALLER transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/CALLER current=/ @@ -597,7 +569,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling CALLER@test.ex t1 transport returned OK for CALLER@test.ex post-process CALLER@test.ex (0) @@ -616,8 +587,6 @@ no retry data available ╰─────result: /non-exist/usery ╰──(tainted) search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local changed uid/gid: local delivery to usery transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/usery current=/ @@ -630,7 +599,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling usery@test.ex t1 transport returned OK for usery@test.ex post-process usery@test.ex (0) @@ -649,8 +617,6 @@ no retry data available ╰─────result: /userz ╰──(tainted) search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local changed uid/gid: local delivery to userz transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/userz current=/ @@ -663,7 +629,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 maildir_use_size_file=no locking by lockfile fcntl search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling userz@test.ex t2 transport returned OK for userz@test.ex post-process userz@test.ex (0)