X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/df98a6ff2e70887890690ffbf8a8ad583d7d7e38..19ae9a55a69e9ea19916eabe3879b786725de92a:/test/stderr/0402 diff --git a/test/stderr/0402 b/test/stderr/0402 index daa7b50f5..a469f8aae 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -1,6 +1,7 @@ Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -41,7 +42,7 @@ 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 }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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 { @@ -50,7 +51,7 @@ 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 }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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 { @@ -61,7 +62,7 @@ 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 }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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 { @@ -69,13 +70,13 @@ Data file written for message 10HmaX-0005vi-00 ├──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 }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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}} ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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 { @@ -87,7 +88,7 @@ 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 }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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 { @@ -102,24 +103,22 @@ Data file written for message 10HmaX-0005vi-00 ╰─────result: from CALLER ├──condition: def:received_protocol ├─────result: true - ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + ╭considering: with $received_protocol }}${if def:tls_in_ver { ($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: with $received_protocol ╰─────result: with local - ├──condition: def:tls_in_cipher_std + ├──condition: def:tls_in_ver ├─────result: false - ╭───scanning: tls $tls_in_cipher_std + ╭───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 $tls_in_cipher_std - - ├─────result: tls - + ├──expanding: ($tls_in_ver) + ├─────result: () ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true @@ -141,7 +140,7 @@ 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 }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver { ($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 { @@ -179,6 +178,7 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config trusted user admin user @@ -284,9 +284,10 @@ usery in "usery"? yes (matched "usery") ╭considering: /non-exist/$domain ├──expanding: /non-exist/$domain ╰─────result: /non-exist/test.ex + ╰──(tainted) calling r5 router -rda_interpret (string): TESTSUITE/test-mail/junk -expanded: TESTSUITE/test-mail/junk +rda_interpret (string): 'TESTSUITE/test-mail/junk' +expanded: 'TESTSUITE/test-mail/junk' file is not a filter file parse_forward_list: TESTSUITE/test-mail/junk extract item: TESTSUITE/test-mail/junk @@ -323,9 +324,10 @@ CALLER in "CALLER"? yes (matched "CALLER") ╭considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part ╰─────result: /non-exist/CALLER + ╰──(tainted) calling r4 router -rda_interpret (string): TESTSUITE/test-mail/junk -expanded: TESTSUITE/test-mail/junk +rda_interpret (string): 'TESTSUITE/test-mail/junk' +expanded: 'TESTSUITE/test-mail/junk' file is not a filter file parse_forward_list: TESTSUITE/test-mail/junk extract item: TESTSUITE/test-mail/junk @@ -356,6 +358,7 @@ userz in "userz"? yes (matched "userz") ╭considering: /non-exist/$domain ├──expanding: /non-exist/$domain ╰─────result: /non-exist/test.ex + ╰──(tainted) calling r3 router r3 router called for userz@test.ex domain = test.ex @@ -381,6 +384,7 @@ usery in "usery"? yes (matched "usery") ╭considering: /non-exist/$domain ├──expanding: /non-exist/$domain ╰─────result: /non-exist/test.ex + ╰──(tainted) calling r2 router r2 router called for usery@test.ex domain = test.ex @@ -401,6 +405,7 @@ CALLER in "CALLER"? yes (matched "CALLER") ╭considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part ╰─────result: /non-exist/CALLER + ╰──(tainted) calling r1 router r1 router called for CALLER@test.ex domain = test.ex @@ -449,6 +454,7 @@ no retry data available ╭considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part ╰─────result: /non-exist/usery + ╰──(tainted) search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -477,6 +483,7 @@ writing to file TESTSUITE/test-mail/junk ├──expanding: $return_path ╰─────result: CALLER@test.ex + ╰──(tainted) ╭───scanning: MAILER-DAEMON}} ${tod_bsdinbox} ├──expanding: MAILER-DAEMON @@ -486,6 +493,7 @@ writing to file TESTSUITE/test-mail/junk ╰─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 + ╰──(tainted) writing data block fd=dddd size=sss timeout=0 cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 @@ -534,6 +542,7 @@ writing to file TESTSUITE/test-mail/junk ├──expanding: $return_path ╰─────result: CALLER@test.ex + ╰──(tainted) ╭───scanning: MAILER-DAEMON}} ${tod_bsdinbox} ├──expanding: MAILER-DAEMON @@ -543,6 +552,7 @@ writing to file TESTSUITE/test-mail/junk ╰─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 + ╰──(tainted) writing data block fd=dddd size=sss timeout=0 cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 @@ -592,6 +602,7 @@ no retry data available ╭considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part ╰─────result: /non-exist/usery + ╰──(tainted) search_tidyup called changed uid/gid: local delivery to usery transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -621,6 +632,7 @@ no retry data available ╭considering: /$local_part ├──expanding: /$local_part ╰─────result: /userz + ╰──(tainted) search_tidyup called changed uid/gid: local delivery to userz transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp