X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1058096b8c5317376c1df7473f6ca7c543d20715..84add256b3467cf6e0d4a2edf72cf5bf16cd9306:/test/stderr/0402 diff --git a/test/stderr/0402 b/test/stderr/0402 index 92b6e9489..2aa76c63d 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -1,11 +1,13 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 +environment after trimming: + PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 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 @@ -27,16 +29,19 @@ Recipients: search_tidyup called >>Headers received: -rewrite_one_header: type=F: - From: CALLER_NAME +qualify & rewrite recipients list +rewrite rules on sender address +qualify and rewrite headers + rewrite_one_header: type=F: + From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -72,6 +77,7 @@ Data file written for message 10HmaX-0005vi-00 ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: ├───scanning: }{${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_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -119,6 +125,7 @@ Data file written for message 10HmaX-0005vi-00 ╎ ${if def:sender_address {(envelope-from <$sender_address>) ╎ }}id $message_exim_id${if def:received_for { ╎ for $received_for}} + ╎├──────value: CALLER ╎├considering: } }}${if def:sender_helo_name {(helo=$sender_helo_name) ╎ }}}}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) @@ -143,6 +150,7 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ├──expanding: from ${quote_local_part:$sender_ident} ╰─────result: from CALLER + ├───item-res: from CALLER ├considering: ${if def:sender_helo_name {(helo=$sender_helo_name) }}}}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) @@ -164,6 +172,7 @@ Data file written for message 10HmaX-0005vi-00 ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: ├───scanning: ) }}}}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) @@ -182,6 +191,7 @@ Data file written for message 10HmaX-0005vi-00 ├─────result: (helo=) ╰───skipping: result is not used + ├───item-res: ├considering: }}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>) @@ -190,6 +200,7 @@ Data file written for message 10HmaX-0005vi-00 ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} ╰─────result: from CALLER + ├───item-res: from CALLER ├considering: 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>) @@ -201,6 +212,7 @@ Data file written for message 10HmaX-0005vi-00 ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: mail.test.ex ├considering: ${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>) @@ -225,6 +237,7 @@ Data file written for message 10HmaX-0005vi-00 ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: local ├considering: }}${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>) @@ -238,16 +251,19 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local + ├───item-res: with local ├considering: ${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}} + ${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 + ├───item-res: ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) @@ -266,6 +282,7 @@ Data file written for message 10HmaX-0005vi-00 ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: ├───scanning: }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) @@ -282,6 +299,7 @@ Data file written for message 10HmaX-0005vi-00 ├─────result: tls ╰───skipping: result is not used + ├───item-res: ├considering: (Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { @@ -291,6 +309,7 @@ Data file written for message 10HmaX-0005vi-00 ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: x.yz ├considering: ) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { @@ -309,6 +328,7 @@ Data file written for message 10HmaX-0005vi-00 ├considering: $sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} + ├──────value: CALLER@test.ex ├considering: >) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -320,11 +340,14 @@ Data file written for message 10HmaX-0005vi-00 ╰─────result: (envelope-from ) + ├───item-res: (envelope-from ) + ├considering: id $message_exim_id${if def:received_for { for $received_for}} ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} + ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -334,12 +357,14 @@ Data file written for message 10HmaX-0005vi-00 ├───────text: for ├───scanning: $received_for}} + ├──────value: ├───scanning: }} ├──expanding: for $received_for ├─────result: for ╰───skipping: result is not used + ├───item-res: ├──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_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -349,31 +374,33 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ╰─────result: Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; 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 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss 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=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 +environment after trimming: + PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config trusted user @@ -386,9 +413,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -453,32 +480,44 @@ routing rd+usery@test.ex --------> r1 router <-------- local_part=rd+usery domain=test.ex checking local_parts +rd+usery in "CALLER"? + list element: CALLER rd+usery in "CALLER"? no (end of list) r1 router skipped: local_parts mismatch --------> r2 router <-------- local_part=rd+usery domain=test.ex checking local_parts +rd+usery in "usery"? + list element: usery rd+usery in "usery"? no (end of list) r2 router skipped: local_parts mismatch --------> r3 router <-------- local_part=rd+usery domain=test.ex checking local_parts +rd+usery in "userz"? + list element: userz rd+usery in "userz"? no (end of list) r3 router skipped: local_parts mismatch --------> r4 router <-------- local_part=rd+usery domain=test.ex stripped prefix rd+ checking local_parts +usery in "CALLER"? + list element: CALLER usery in "CALLER"? no (end of list) r4 router skipped: local_parts mismatch --------> r5 router <-------- local_part=rd+usery domain=test.ex stripped prefix rd+ checking local_parts -usery in "usery"? yes (matched "usery") +usery in "usery"? + list element: usery + usery in "usery"? yes (matched "usery") ╭considering: /non-exist/$domain ├───────text: /non-exist/ ├considering: $domain + ├──────value: test.ex + ╰──(tainted) ├──expanding: /non-exist/$domain ╰─────result: /non-exist/test.ex ╰──(tainted) @@ -501,26 +540,36 @@ routing rd+CALLER@test.ex --------> r1 router <-------- local_part=rd+CALLER domain=test.ex checking local_parts +rd+CALLER in "CALLER"? + list element: CALLER rd+CALLER in "CALLER"? no (end of list) r1 router skipped: local_parts mismatch --------> r2 router <-------- local_part=rd+CALLER domain=test.ex checking local_parts +rd+CALLER in "usery"? + list element: usery rd+CALLER in "usery"? no (end of list) r2 router skipped: local_parts mismatch --------> r3 router <-------- local_part=rd+CALLER domain=test.ex checking local_parts +rd+CALLER in "userz"? + list element: userz rd+CALLER in "userz"? no (end of list) r3 router skipped: local_parts mismatch --------> r4 router <-------- local_part=rd+CALLER domain=test.ex stripped prefix rd+ checking local_parts -CALLER in "CALLER"? yes (matched "CALLER") +CALLER in "CALLER"? + list element: CALLER + CALLER in "CALLER"? yes (matched "CALLER") ╭considering: /non-exist/$local_part ├───────text: /non-exist/ ├considering: $local_part + ├──────value: CALLER + ╰──(tainted) ├──expanding: /non-exist/$local_part ╰─────result: /non-exist/CALLER ╰──(tainted) @@ -543,20 +592,28 @@ routing userz@test.ex --------> r1 router <-------- local_part=userz domain=test.ex checking local_parts +userz in "CALLER"? + list element: CALLER userz in "CALLER"? no (end of list) r1 router skipped: local_parts mismatch --------> r2 router <-------- local_part=userz domain=test.ex checking local_parts +userz in "usery"? + list element: usery userz in "usery"? no (end of list) r2 router skipped: local_parts mismatch --------> r3 router <-------- local_part=userz domain=test.ex checking local_parts -userz in "userz"? yes (matched "userz") +userz in "userz"? + list element: userz + userz in "userz"? yes (matched "userz") ╭considering: /non-exist/$domain ├───────text: /non-exist/ ├considering: $domain + ├──────value: test.ex + ╰──(tainted) ├──expanding: /non-exist/$domain ╰─────result: /non-exist/test.ex ╰──(tainted) @@ -576,15 +633,21 @@ routing usery@test.ex --------> r1 router <-------- local_part=usery domain=test.ex checking local_parts +usery in "CALLER"? + list element: CALLER usery in "CALLER"? no (end of list) r1 router skipped: local_parts mismatch --------> r2 router <-------- local_part=usery domain=test.ex checking local_parts -usery in "usery"? yes (matched "usery") +usery in "usery"? + list element: usery + usery in "usery"? yes (matched "usery") ╭considering: /non-exist/$domain ├───────text: /non-exist/ ├considering: $domain + ├──────value: test.ex + ╰──(tainted) ├──expanding: /non-exist/$domain ╰─────result: /non-exist/test.ex ╰──(tainted) @@ -604,10 +667,14 @@ routing CALLER@test.ex --------> r1 router <-------- local_part=CALLER domain=test.ex checking local_parts -CALLER in "CALLER"? yes (matched "CALLER") +CALLER in "CALLER"? + list element: CALLER + CALLER in "CALLER"? yes (matched "CALLER") ╭considering: /non-exist/$local_part ├───────text: /non-exist/ ├considering: $local_part + ├──────value: CALLER + ╰──(tainted) ├──expanding: /non-exist/$local_part ╰─────result: /non-exist/CALLER ╰──(tainted) @@ -659,16 +726,19 @@ no retry data available ╭considering: /non-exist/$local_part ├───────text: /non-exist/ ├considering: $local_part + ├──────value: usery + ╰──(tainted) ├──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 + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=/non-exist/usery current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered ╭considering: $address_file + ├──────value: TESTSUITE/test-mail/junk ├──expanding: $address_file ╰─────result: TESTSUITE/test-mail/junk appendfile: mode=600 notify_comsat=0 quota=0 warning=0 @@ -691,6 +761,8 @@ writing to file TESTSUITE/test-mail/junk ├─────result: true ╭considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + ├──────value: CALLER@test.ex + ╰──(tainted) ├considering: }{MAILER-DAEMON}} ${tod_bsdinbox} ├──expanding: $return_path @@ -704,6 +776,8 @@ writing to file TESTSUITE/test-mail/junk ├──expanding: MAILER-DAEMON ├─────result: MAILER-DAEMON ╰───skipping: result is not used + ├───item-res: CALLER@test.ex + ╰──(tainted) ├considering: ${tod_bsdinbox} ├───────text: @@ -740,11 +814,12 @@ LOG: MAIN no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1237 home=/non-exist/CALLER current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered ╭considering: $address_file + ├──────value: TESTSUITE/test-mail/junk ├──expanding: $address_file ╰─────result: TESTSUITE/test-mail/junk appendfile: mode=600 notify_comsat=0 quota=0 warning=0 @@ -767,6 +842,8 @@ writing to file TESTSUITE/test-mail/junk ├─────result: true ╭considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + ├──────value: CALLER@test.ex + ╰──(tainted) ├considering: }{MAILER-DAEMON}} ${tod_bsdinbox} ├──expanding: $return_path @@ -780,6 +857,8 @@ writing to file TESTSUITE/test-mail/junk ├──expanding: MAILER-DAEMON ├─────result: MAILER-DAEMON ╰───skipping: result is not used + ├───item-res: CALLER@test.ex + ╰──(tainted) ├considering: ${tod_bsdinbox} ├───────text: @@ -816,9 +895,9 @@ LOG: MAIN no retry data available search_tidyup called changed uid/gid: local delivery to CALLER transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1238 home=/non-exist/CALLER current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to CALLER using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -843,14 +922,16 @@ no retry data available ╭considering: /non-exist/$local_part ├───────text: /non-exist/ ├considering: $local_part + ├──────value: usery + ╰──(tainted) ├──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 + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=/non-exist/usery current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to usery using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to usery using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -875,14 +956,16 @@ no retry data available ╭considering: /$local_part ├───────text: / ├considering: $local_part + ├──────value: userz + ╰──(tainted) ├──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 + uid=CALLER_UID gid=CALLER_GID pid=p1240 home=/userz current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userz using t2 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userz using t2 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -899,8 +982,8 @@ LOG: MAIN => userz R=r3 T=t2 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1235 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userz@test.ex: no retry items @@ -973,9 +1056,9 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>