X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/aae673d7db4b26e8c4a8cc3d59fe94de4c47ba16..82ab9af25b43cb3b56a95383eba52a866400911a:/test/stderr/0386 diff --git a/test/stderr/0386 b/test/stderr/0386 index e6aeda9e2..ace0dc69c 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -254,33 +254,33 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: -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 [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for 2@b; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -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: <2@b> 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 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 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=p1236 @@ -293,9 +293,9 @@ dropping to exim gid; retaining priv uid 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=x@y sender_fullhost = (test) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -356,7 +356,7 @@ search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to 2 using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 2 using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/2 format=unix @@ -385,7 +385,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1236 -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: 2@b: no retry items @@ -402,7 +402,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=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -451,33 +451,33 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: -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 [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for 2@b; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -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: <2@b> 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 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 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=p1238 @@ -490,9 +490,9 @@ dropping to exim gid; retaining priv uid 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=x@y sender_fullhost = (test) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -553,7 +553,7 @@ search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to 2 using t1 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to 2 using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/2 format=unix @@ -582,7 +582,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1238 -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: 2@b: no retry items @@ -599,7 +599,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=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>