X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstderr%2F0402;h=a469f8aae094f13005d030c14ec921fdd7448aae;hb=da40b1ec6b91ccd3faa4def9e5cff05ec51ca573;hp=3d90308374dc3c402a60c9853fba3cdcf2a7e19d;hpb=bff2d6435aecaf2701ba12c4dd99c7f395953f19;p=exim.git diff --git a/test/stderr/0402 b/test/stderr/0402 index 3d9030837..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 { @@ -157,18 +156,18 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) ├──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 :0 -DSN: **** SPOOL_OUT - address: |CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |usery@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |userz@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |rd+CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 -DSN: Flags :0 -DSN: **** SPOOL_OUT - address: |rd+usery@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +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 LOG: MAIN @@ -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 @@ -205,11 +205,11 @@ recipients_count=5 **** SPOOL_IN - No additional fields **** SPOOL_IN - No additional fields body_linecount=0 message_linecount=6 -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 +DSN: set orcpt: flags: 0x0 +DSN: set orcpt: flags: 0x0 +DSN: set orcpt: flags: 0x0 +DSN: set orcpt: flags: 0x0 +DSN: set orcpt: flags: 0x0 Delivery address list: CALLER@test.ex usery@test.ex @@ -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 @@ -661,7 +673,7 @@ end of retry processing DSN: processing router : r3 DSN: processing successful delivery address: userz@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: userz@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -669,7 +681,7 @@ DSN: not sending DSN success message DSN: processing router : r2 DSN: processing successful delivery address: usery@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: usery@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -677,7 +689,7 @@ DSN: not sending DSN success message DSN: processing router : r1 DSN: processing successful delivery address: CALLER@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: CALLER@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -685,7 +697,7 @@ DSN: not sending DSN success message DSN: processing router : r4 DSN: processing successful delivery address: TESTSUITE/test-mail/junk DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: TESTSUITE/test-mail/junk DSN: Remote SMTP server supports DSN: 0 @@ -693,7 +705,7 @@ DSN: not sending DSN success message DSN: processing router : r5 DSN: processing successful delivery address: TESTSUITE/test-mail/junk DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: TESTSUITE/test-mail/junk DSN: Remote SMTP server supports DSN: 0 @@ -701,7 +713,7 @@ DSN: not sending DSN success message DSN: processing router : r4 DSN: processing successful delivery address: rd+CALLER@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: rd+CALLER@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -709,7 +721,7 @@ DSN: not sending DSN success message DSN: processing router : r5 DSN: processing successful delivery address: rd+usery@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: rd+usery@test.ex DSN: Remote SMTP server supports DSN: 0