X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..cd19f9a79c20f9c0c9d650a8aa21d9cc54a66620:/test/stderr/0404 diff --git a/test/stderr/0404 b/test/stderr/0404 index b3cccddcc..bf8a60e5d 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -53,8 +53,8 @@ Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, **** debug string too long - truncated **** qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=R: Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, @@ -92,7 +92,8 @@ rewrite headers From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, + R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, + sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, @@ -121,30 +122,29 @@ R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, - sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, - sender@test.ex, sender@test.ex, sender@ + sender@test.ex, sender@test.ex, sender **** debug string too long - truncated **** -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 >>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 for userx@test.ex; 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 -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=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -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=p1235 @@ -157,9 +157,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: @@ -247,10 +247,10 @@ search_tidyup called changed uid/gid: local delivery to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <>sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... using t1 t1 transport entered taking data from address -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 @@ -272,13 +272,13 @@ search_tidyup called >>Headers received: To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, **** debug string too long - truncated **** -In-Reply-To: -References: +In-Reply-To: +References: Auto-Submitted: auto-replied qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=T: To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, **** debug string too long - truncated **** @@ -286,22 +286,22 @@ rewrite headers From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.e -**** debug string too long - truncated **** - In-Reply-To: - References: - Auto-Submitted: auto-replied -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test. + **** debug string too long - truncated **** + In-Reply-To: + References: + Auto-Submitted: auto-replied + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-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 @@ -910,12 +910,12 @@ DSN: **** SPOOL_OUT - address: errorsto: orcpt: d 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//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1239 @@ -928,9 +928,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 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender= sender_local=1 ident=CALLER Non-recipients: @@ -18596,7 +18596,7 @@ search_tidyup called changed uid/gid: local delivery to sender transport=t2 uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to sender using t2 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to sender using t2 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/sender format=unix @@ -18627,7 +18627,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1239 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: sender@test.ex: no retry items @@ -18644,7 +18644,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -18662,7 +18662,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...: no retry items @@ -18689,7 +18689,7 @@ 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=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>