X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/46d2a5e6f6e7709d172903b13945d23fc0a2c888..c90c2288e88f66ae1d8af198cfa56c401e573ce4:/test/stderr/5005 diff --git a/test/stderr/5005 b/test/stderr/5005 index c6a8dfdbb..d9041e69f 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,39 +18,37 @@ 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 >>Generated Received: header line 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 -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 + id 10HmaX-000000005vi-0000 + for nofile@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +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 -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 +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=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -58,17 +56,17 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available 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: -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 @@ -76,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 @@ -96,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 @@ -117,23 +114,23 @@ 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 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 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to nofile using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/nofile format=maildir 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 created directory TESTSUITE/test-mail/nofile/new created directory TESTSUITE/test-mail/nofile/cur +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/nofile TESTSUITE/test-mail/nofile/maildirsize does not exist: recalculating @@ -160,7 +157,6 @@ renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling nofile@test.ex t1 transport returned OK for nofile@test.ex post-process nofile@test.ex (0) @@ -169,8 +165,8 @@ LOG: MAIN => nofile R=r1 T=t1 >>>>>>>>>>>>>>>> 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: nofile@test.ex: no retry items @@ -187,19 +183,19 @@ 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 >>>>>>>>>>>>>>>> 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 @@ -213,38 +209,36 @@ 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//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 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 + id 10HmaY-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 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 <= CALLER@test.ex U=CALLER P=local S=sss 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 10HmaY-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp +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=pppp + uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config trusted user admin user @@ -252,17 +246,17 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available 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=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 @@ -289,7 +283,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 @@ -310,22 +304,22 @@ 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 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 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/userx format=maildir 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 created directory TESTSUITE/test-mail/userx/cur +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx reading quota parameters from maildirsize data @@ -355,7 +349,6 @@ renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex appendfile yields 0 with errno=dd more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp journalling userx@test.ex t1 transport returned OK for userx@test.ex post-process userx@test.ex (0) @@ -364,8 +357,8 @@ LOG: MAIN => userx R=r1 T=t1 >>>>>>>>>>>>>>>> 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 10HmaY-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1238 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -382,19 +375,19 @@ 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=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 @@ -408,38 +401,36 @@ 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//10HmaZ-0005vi-00-D -Data file written for message 10HmaZ-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +Data file written for message 10HmaZ-000000005vi-0000 >>Generated Received: header line 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 + id 10HmaZ-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss 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 10HmaZ-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-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=p1241 configuration file is TESTSUITE/test-config trusted user admin user @@ -447,17 +438,17 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaZ-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaZ-0005vi-00-D -reading spool file 10HmaZ-0005vi-00-H +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +reading spool file 10HmaZ-000000005vi-0000-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 @@ -484,7 +475,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 @@ -505,19 +496,19 @@ 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 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 +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/userx format=maildir 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 +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx reading quota parameters from maildirsize data @@ -545,7 +536,6 @@ maildir: time since "new" directory modified = 10s Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex appendfile yields 1 with errno=-22 more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp t1 transport returned DEFER for userx@test.ex added retry item for T:userx@test.ex: errno=-22 more_errno=dd flags=0 post-process userx@test.ex (1) @@ -553,8 +543,8 @@ 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 -set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1241 +set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000 Processing retry items Succeeded addresses: Failed addresses: @@ -565,9 +555,13 @@ 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 "*") + userx@test.ex in "*"? + list element: * + address match test: subject=userx@test.ex pattern=* + test.ex in "*"? + list element: * + 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 @@ -579,26 +573,23 @@ Writing retry data for T:userx@test.ex closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H Size of headers = sss -end delivery of 10HmaZ-0005vi-00 +end delivery of 10HmaZ-000000005vi-0000 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 @@ -612,38 +603,36 @@ 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//10HmbA-0005vi-00-D -Data file written for message 10HmbA-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +Data file written for message 10HmbA-000000005vi-0000 >>Generated Received: header line 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 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 + id 10HmbA-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss 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 10HmbA-0005vi-00 -fresh-exec forked for local-accept-delivery: npppp +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-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=p1244 configuration file is TESTSUITE/test-config trusted user admin user @@ -651,17 +640,17 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmbA-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmbA-0005vi-00-D -reading spool file 10HmbA-0005vi-00-H +set_process_info: pppp delivering 10HmbA-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +reading spool file 10HmbA-000000005vi-0000-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 @@ -692,7 +681,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 @@ -717,19 +706,19 @@ retry record exists: age=ttt (max 1w) EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile search_tidyup called -local-accept-delivery forking for delivery-local -postfork: delivery-local 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 +set_process_info: pppp delivering 10HmbA-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/userx format=maildir 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 +compiling RE '^(?:cur|new|\..*)$' using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx reading quota parameters from maildirsize data @@ -744,7 +733,6 @@ maildir: time since "new" directory modified = 10s Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex appendfile yields 1 with errno=-22 more_errno=dd search_tidyup called -local-accept-delivery forked for delivery-local: npppp t1 transport returned DEFER for userx@test.ex added retry item for T:userx@test.ex: errno=-22 more_errno=dd flags=0 post-process userx@test.ex (1) @@ -752,8 +740,8 @@ 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 -set_process_info: pppp tidying up after delivering 10HmbA-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1244 +set_process_info: pppp tidying up after delivering 10HmbA-000000005vi-0000 Processing retry items Succeeded addresses: Failed addresses: @@ -764,9 +752,13 @@ 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 "*") + userx@test.ex in "*"? + list element: * + address match test: subject=userx@test.ex pattern=* + test.ex in "*"? + list element: * + 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 @@ -778,16 +770,13 @@ Writing retry data for T:userx@test.ex closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 -DSN: Write SPOOL: -dsn_envid NULL -DSN: Write SPOOL :-dsn_ret 0 -DSN: Flags: 0x0 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H Size of headers = sss -end delivery of 10HmbA-0005vi-00 +end delivery of 10HmbA-000000005vi-0000 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 >>>>>>>>>>>>>>>>