X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/32393657bff79d9925ec865aebb066c9409c4e27..376d3790ba2756278e28d0ecaa1ed7c9b1a0ab00:/test/stderr/5004?ds=sidebyside diff --git a/test/stderr/5004 b/test/stderr/5004 index af0418737..e5b5340eb 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -20,8 +20,11 @@ Recipients: search_tidyup called >>Headers received: -rewrite_one_header: type=F: - From: CALLER_NAME +qualify & rewrite recipients list +global rewrite rules +rewrite headers + rewrite_one_header: type=F: + From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: I Message-Id: @@ -34,11 +37,9 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + for userx@test.ex; + 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: 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 @@ -46,10 +47,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -fresh-exec forking for local-accept-delivery -postfork: local-accept-delivery exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -68,11 +66,11 @@ reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: -Empty Tree + Empty Tree ---- End of tree ---- recipients_count=1 **** SPOOL_IN - No additional fields -body_linecount=1 message_linecount=7 +body_linecount=1 message_linecount=8 DSN: set orcpt: flags: 0x0 Delivery address list: userx@test.ex @@ -80,8 +78,7 @@ Delivery address list: locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) - ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim - failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -98,8 +95,6 @@ rda_interpret (string): '# Exim filter\nsave TESTSUITE/test-mail' expanded: '# Exim filter save TESTSUITE/test-mail' search_tidyup called -local-accept-delivery forking for router-interpret -postfork: router-interpret changed uid/gid: r1 router (recipient is userx@test.ex) uid=CALLER_UID gid=CALLER_GID pid=pppp turned off address rewrite logging (not root or exim in this process) @@ -107,8 +102,7 @@ data is an Exim filter program Filter: start of processing Filter: end of processing search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>> -local-accept-delivery forked for router-interpret: npppp +>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>> rda_interpret: subprocess yield=0 error=NULL set transport t1 r1 router generated TESTSUITE/test-mail @@ -145,8 +139,6 @@ search_tidyup called failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local changed uid/gid: local delivery to TESTSUITE/test-mail transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=NULL current=/ @@ -169,7 +161,6 @@ renaming temporary file renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling TESTSUITE/test-mail:userx@test.ex t1 transport returned OK for TESTSUITE/test-mail post-process TESTSUITE/test-mail (0) @@ -210,6 +201,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>