X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..36bee217cba7c61313cce8e4a4a0c477db421dd0:/test/stderr/0408?ds=sidebyside diff --git a/test/stderr/0408 b/test/stderr/0408 index e50472ce3..6c5a96815 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -1,22 +1,7 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -35,40 +20,37 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +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 mail.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -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: 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 -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=p1235 -list element: PATH -list element: PATH -list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK -list element: PATH configuration file is TESTSUITE/test-config trusted user admin user @@ -76,9 +58,9 @@ 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: @@ -90,8 +72,6 @@ body_linecount=0 message_linecount=8 DSN: set orcpt: flags: 0x0 Delivery address list: userx@test.ex - 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 @@ -107,8 +87,9 @@ routing userx@test.ex --------> r1 router <-------- local_part=userx domain=test.ex checking local_parts -list element: userx -userx in "userx : usery"? yes (matched "userx") +userx in local_parts? + list element: userx + userx in local_parts? yes (matched "userx") calling r1 router r1 router called for userx@test.ex domain = test.ex @@ -122,9 +103,10 @@ routing usery@test.ex --------> r1 router <-------- local_part=usery domain=test.ex checking local_parts -list element: userx -list element: usery -usery in "userx : usery"? yes (matched "usery") +usery in local_parts? + list element: userx + list element: usery + usery in local_parts? yes (matched "usery") calling r1 router r1 router called for usery@test.ex domain = test.ex @@ -157,8 +139,6 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- - 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 @@ -167,7 +147,7 @@ search_tidyup called changed uid/gid: local delivery to userx transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/userx format=unix @@ -175,7 +155,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/userx' +below-home: de-tainting path 'TESTSUITE/test-mail/userx' lock name: TESTSUITE/test-mail/userx.lock hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created @@ -196,7 +176,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -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: userx@test.ex: no retry items @@ -213,7 +193,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=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>