X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d202d925afe3876b8f8f6e16b209ac89c09653e3..43e2db44c657b07340368eae5dd05e51eab829fb:/test/stderr/0402 diff --git a/test/stderr/0402 b/test/stderr/0402 index d308540bb..9f6f6264e 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -41,7 +41,8 @@ Data file written for message 10HmaX-0005vi-00 └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$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 }}${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}} @@ -49,7 +50,8 @@ Data file written for message 10HmaX-0005vi-00 ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$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 }}${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}} @@ -59,19 +61,22 @@ Data file written for message 10HmaX-0005vi-00 └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$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 }}${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}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$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 }}${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}} ╎┌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 }}${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}} @@ -82,7 +87,8 @@ Data file written for message 10HmaX-0005vi-00 ├──condition: def:sender_helo_name ├─────result: false ┌───scanning: (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 }}${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}} @@ -96,12 +102,25 @@ Data file written for message 10HmaX-0005vi-00 └─────result: from CALLER ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}${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: with $received_protocol - └─────result: with local + ├──expanding: with $received_protocol + └─────result: with local + ├──condition: def:tls_in_cipher_std + ├─────result: false + ┌───scanning: 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 $tls_in_cipher_std + + ├─────result: tls + + └───skipping: result is not used ├──condition: def:sender_address ├─────result: true ┌considering: (envelope-from <$sender_address>) @@ -122,7 +141,8 @@ Data file written for message 10HmaX-0005vi-00 └───skipping: result is not used ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$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 }}${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}} @@ -136,7 +156,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) ┌considering: ${tod_full} ├──expanding: ${tod_full} └─────result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +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 :0 @@ -155,13 +175,14 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95dfd -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid 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 @@ -195,42 +216,42 @@ Delivery address list: userz@test.ex rd+CALLER@test.ex rd+usery@test.ex -locking TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + 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 no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@test.ex unique = CALLER@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record CALLER@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@test.ex unique = usery@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record usery@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userz@test.ex unique = userz@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record userz@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: rd+CALLER@test.ex unique = rd+CALLER@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record rd+CALLER@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: rd+usery@test.ex unique = rd+usery@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record rd+usery@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing rd+usery@test.ex @@ -391,11 +412,11 @@ domain = test.ex routed by r1 router envelope to: CALLER@test.ex transport: t1 -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + 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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: TESTSUITE/test-mail/junk @@ -419,11 +440,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail/junk <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + 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 ┌considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part @@ -479,11 +500,11 @@ rd+usery@test.ex: children all complete LOG: MAIN => TESTSUITE/test-mail/junk R=r5 T=ft1 --------> TESTSUITE/test-mail/junk <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + 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 search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 @@ -536,11 +557,11 @@ rd+CALLER@test.ex: children all complete LOG: MAIN => TESTSUITE/test-mail/junk R=r4 T=ft1 --------> CALLER@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + 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 search_tidyup called changed uid/gid: local delivery to CALLER transport=t1 @@ -562,11 +583,11 @@ CALLER@test.ex delivered LOG: MAIN => CALLER R=r1 T=t1 --------> usery@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + 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 ┌considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part @@ -591,11 +612,11 @@ usery@test.ex delivered LOG: MAIN => usery R=r2 T=t1 --------> userz@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -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 + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + 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 ┌considering: /$local_part ├──expanding: /$local_part