git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tidying
[exim.git] / test / stderr / 0361
diff --git a/test/stderr/0361 b/test/stderr/0361
index a5d70178479857058490ecf5cb58924bfe7b9e46..dd2259ca8ab2914f075a5d1360d6ca520e4aeef2 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -7,11 +7,11 @@ LOG: MAIN
   Completed
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   Completed
 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
 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
 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
@@ -25,8 +25,11 @@ Recipients:
 search_tidyup called
 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 
-rewrite_one_header: type=F:
-  From: CALLER_NAME <CALLER@test.ex>
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
+ rewrite_one_header: type=F:
+   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
 I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 search_tidyup called
 >>Headers after rewriting and local additions:
 I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
@@ -39,7 +42,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
 P Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
-       for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for kilos@recurse.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: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -50,7 +54,7 @@ search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -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=p1235
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -64,11 +68,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:
 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
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   kilos@recurse.test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   kilos@recurse.test.ex 
@@ -191,7 +195,7 @@ set transport t2
 queued for t2 transport: local_part = kilos
 domain = recurse.test.ex.test.ex
   errors_to=NULL
 queued for t2 transport: local_part = kilos
 domain = recurse.test.ex.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r4 router
   envelope to: kilos@recurse.test.ex.test.ex
   transport: t2
 routed by r4 router
   envelope to: kilos@recurse.test.ex.test.ex
   transport: t2
@@ -213,7 +217,7 @@ search_tidyup called
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to kilos <kilos@recurse.test.ex.test.ex> transport=t2
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to kilos <kilos@recurse.test.ex.test.ex> transport=t2
-  uid=CALLER_UID gid=CALLER_GID pid=pppp
+  uid=CALLER_UID gid=CALLER_GID pid=p1236
   home=NULL current=/
 set_process_info: pppp delivering 10HmaY-0005vi-00 to kilos using t2
 appendfile transport entered
   home=NULL current=/
 set_process_info: pppp delivering 10HmaY-0005vi-00 to kilos using t2
 appendfile transport entered
@@ -235,7 +239,7 @@ LOG: MAIN
   *> kilos <kilos@recurse.test.ex> R=r4 T=t2
 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 changed uid/gid: post-delivery tidying
   *> kilos <kilos@recurse.test.ex> R=r4 T=t2
 >>>>>>>>>>>>>>>> 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 10HmaY-0005vi-00
 DSN: processing router : r4
 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex
 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
 DSN: processing router : r4
 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex
@@ -258,6 +262,6 @@ LOG: MAIN
 end delivery of 10HmaY-0005vi-00
 search_tidyup called
 search_tidyup called
 end delivery of 10HmaY-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
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Master Exim source repository