X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0c6608531368096bafebac4e488f84891368b006..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/stderr/0386?ds=sidebyside diff --git a/test/stderr/0386 b/test/stderr/0386 index 10cee1adf..bb322c8a4 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available @@ -163,10 +164,11 @@ LOG: MAIN REJECT SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available @@ -231,12 +233,12 @@ check acl = TESTSUITE/aux-fixed/0386.acl2 check dnslists = rbl.test.ex dnslists check: rbl.test.ex new DNS lookup for 13.12.11.V4NET.rbl.test.ex -DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) using fakens -DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) succeeded + DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) using fakens + DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) succeeded dnslists: wrote cache entry, ttl=3 DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) -DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens -DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded + DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens + DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded => that means V4NET.11.12.13 is listed at rbl.test.ex warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2" LOG: MAIN @@ -254,34 +256,35 @@ 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 .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available @@ -293,9 +296,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) @@ -309,8 +312,6 @@ body_linecount=1 message_linecount=8 DSN: set orcpt: flags: 0x0 Delivery address list: 2@b - locking TESTSUITE/spool/db/retry.lockfile - locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory @@ -346,8 +347,6 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- - locking TESTSUITE/spool/db/retry.lockfile - locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory @@ -356,7 +355,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 @@ -364,7 +363,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 message_suffix=\n maildir_use_size_file=no locking by lockfile fcntl -de-tainting path 'TESTSUITE/test-mail/2' +below-home: de-tainting path 'TESTSUITE/test-mail/2' lock name: TESTSUITE/test-mail/2.lock hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created @@ -376,6 +375,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> journalling 2@b t1 transport returned OK for 2@b post-process 2@b (0) @@ -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,34 +451,35 @@ 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 .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available @@ -490,9 +491,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) @@ -506,8 +507,6 @@ body_linecount=1 message_linecount=8 DSN: set orcpt: flags: 0x0 Delivery address list: 2@b - locking TESTSUITE/spool/db/retry.lockfile - locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory @@ -543,8 +542,6 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- - locking TESTSUITE/spool/db/retry.lockfile - locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) failed to open DB file TESTSUITE/spool/db/retry: No such file or directory @@ -553,7 +550,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 @@ -561,7 +558,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0 message_suffix=\n maildir_use_size_file=no locking by lockfile fcntl -de-tainting path 'TESTSUITE/test-mail/2' +below-home: de-tainting path 'TESTSUITE/test-mail/2' lock name: TESTSUITE/test-mail/2.lock hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created @@ -573,6 +570,7 @@ writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> journalling 2@b t1 transport returned OK for 2@b post-process 2@b (0) @@ -582,7 +580,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 +597,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 >>>>>>>>>>>>>>>> @@ -607,6 +605,6 @@ smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT + SMTP connection from CALLER D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>