X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/faeb80dc19bd3cd02ca367090382e58151bfd13a..3bfdf0f1f1d7a1bb6e9c3e4c6af8d1117dd13955:/test/stderr/5005 diff --git a/test/stderr/5005 b/test/stderr/5005 index 9f230101e..c7cc34539 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 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 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -18,8 +18,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: @@ -32,7 +35,8 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 - for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + for nofile@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H @@ -44,7 +48,7 @@ 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 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -58,11 +62,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: nofile@test.ex @@ -70,8 +74,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: nofile@test.ex @@ -90,7 +93,7 @@ set transport t1 queued for t1 transport: local_part = nofile domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: nofile@test.ex transport: t1 @@ -112,7 +115,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to nofile transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to nofile using t1 appendfile transport entered @@ -121,6 +124,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0 message_prefix=null message_suffix=null maildir_use_size_file=yes +de-tainting path 'TESTSUITE/test-mail/nofile' ensuring maildir directories exist in TESTSUITE/test-mail/nofile created directory TESTSUITE/test-mail/nofile created directory TESTSUITE/test-mail/nofile/tmp @@ -160,7 +164,7 @@ LOG: MAIN => nofile R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: @@ -181,16 +185,16 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 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 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 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=p1237 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -204,8 +208,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: @@ -218,7 +225,8 @@ Data file written for message 10HmaY-0005vi-00 P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-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.10HmaY-0005vi-00 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H @@ -229,7 +237,7 @@ 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 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config trusted user admin user @@ -243,11 +251,11 @@ reading spool file 10HmaY-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 @@ -274,7 +282,7 @@ set transport t1 queued for t1 transport: local_part = userx domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: userx@test.ex transport: t1 @@ -296,7 +304,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ set_process_info: pppp delivering 10HmaY-0005vi-00 to userx using t1 appendfile transport entered @@ -305,6 +313,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0 message_prefix=null message_suffix=null maildir_use_size_file=yes +de-tainting path 'TESTSUITE/test-mail/userx' ensuring maildir directories exist in TESTSUITE/test-mail/userx created directory TESTSUITE/test-mail/userx/tmp created directory TESTSUITE/test-mail/userx/new @@ -346,7 +355,7 @@ LOG: MAIN => userx R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1238 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: @@ -367,16 +376,16 @@ LOG: MAIN end delivery of 10HmaY-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1240 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=p1240 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -390,8 +399,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: @@ -404,7 +416,8 @@ Data file written for message 10HmaZ-0005vi-00 P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-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.10HmaZ-0005vi-00 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H @@ -415,7 +428,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1241 configuration file is TESTSUITE/test-config trusted user admin user @@ -429,11 +442,11 @@ reading spool file 10HmaZ-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 @@ -460,7 +473,7 @@ set transport t1 queued for t1 transport: local_part = userx domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: userx@test.ex transport: t1 @@ -482,7 +495,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1242 home=NULL current=/ set_process_info: pppp delivering 10HmaZ-0005vi-00 to userx using t1 appendfile transport entered @@ -491,6 +504,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0 message_prefix=null message_suffix=null maildir_use_size_file=yes +de-tainting path 'TESTSUITE/test-mail/userx' ensuring maildir directories exist in TESTSUITE/test-mail/userx using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx @@ -526,7 +540,7 @@ LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1241 set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 Processing retry items Succeeded addresses: @@ -538,9 +552,9 @@ Deferred addresses: EXIM_DBOPEN: file dir flags=O_RDWR returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR -address match test: subject=userx@test.ex pattern=* -test.ex in "*"? yes (matched "*") -userx@test.ex in "*"? yes (matched "*") + address match test: subject=userx@test.ex pattern=* + test.ex in "*"? yes (matched "*") + userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 dbfn_read: key=T:userx@test.ex failing_interval=ttt message_age=ttt @@ -559,16 +573,16 @@ Size of headers = sss end delivery of 10HmaZ-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1243 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=p1243 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -582,8 +596,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: @@ -596,7 +613,8 @@ Data file written for message 10HmbA-0005vi-00 P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-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.10HmbA-0005vi-00 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H @@ -607,7 +625,7 @@ search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1244 configuration file is TESTSUITE/test-config trusted user admin user @@ -621,11 +639,11 @@ reading spool file 10HmbA-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 @@ -656,7 +674,7 @@ set transport t1 queued for t1 transport: local_part = userx domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: userx@test.ex transport: t1 @@ -682,7 +700,7 @@ retry record exists: age=ttt (max 1w) closed hints database and lockfile search_tidyup called changed uid/gid: local delivery to userx transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1245 home=NULL current=/ set_process_info: pppp delivering 10HmbA-0005vi-00 to userx using t1 appendfile transport entered @@ -691,6 +709,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0 message_prefix=null message_suffix=null maildir_use_size_file=yes +de-tainting path 'TESTSUITE/test-mail/userx' ensuring maildir directories exist in TESTSUITE/test-mail/userx using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx @@ -713,7 +732,7 @@ LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1244 set_process_info: pppp tidying up after delivering 10HmbA-0005vi-00 Processing retry items Succeeded addresses: @@ -725,9 +744,9 @@ Deferred addresses: EXIM_DBOPEN: file dir flags=O_RDWR returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR -address match test: subject=userx@test.ex pattern=* -test.ex in "*"? yes (matched "*") -userx@test.ex in "*"? yes (matched "*") + address match test: subject=userx@test.ex pattern=* + test.ex in "*"? yes (matched "*") + userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 dbfn_read: key=T:userx@test.ex failing_interval=ttt message_age=ttt @@ -746,6 +765,6 @@ Size of headers = sss end delivery of 10HmbA-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1244 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>