Taint: enforce untainted ACL text line

[exim.git] / test / stderr / 0476

diff --git a/test/stderr/0476 b/test/stderr/0476
index 69ab06b888631ab8d9b69e2502912ebb63f6b5b0..98baf51207fb185ba607731ac3a2f5bc259f72d6 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -6,7 +6,7 @@ set_process_info: pppp running the queue (single queue run)
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 set_process_info: pppp running queue: 10HmaX-0005vi-00-H
-set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp)
+set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid pppp)
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
@@ -27,13 +27,13 @@ cmd buf flush ddd bytes
          250 OK
 using PIPELINING
 not using DSN
-  SMTP>> MAIL FROM:<CALLER@the.local.host.name>
-  SMTP>> RCPT TO:<userx@test.ex>
+  SMTP|> MAIL FROM:<CALLER@the.local.host.name>
+  SMTP|> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
 sync_responses expect mail
   SMTP<< 250 OK
-sync_responses expect rcpt
+sync_responses expect rcpt for userx@test.ex
   SMTP<< 550 NO
 sync_responses expect data
   SMTP(closed)<<
@@ -42,6 +42,7 @@ error for DATA ignored: pipelining is in use and there were no good recipients
 ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
+transport_check_waiting: TRUE
   SMTP>> RSET
 cmd buf flush ddd bytes
   SMTP(closed)<<
@@ -56,13 +57,13 @@ set_process_info: pppp delivering 10HmaX-0005vi-00
 LOG: MAIN
   ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 550 NO
 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-cannot use sendfile for body: spoolfile not wireformat
-writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 set_process_info: pppp accepting a local non-SMTP message from <>
+cannot use sendfile for body: spoolfile not wireformat
+writing data block fd=dddd size=sss timeout=0
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
@@ -90,7 +91,7 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.
 added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
-added to list for 127.0.0.1
+added 10HmaZ-0005vi-00 to queue for 127.0.0.1
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess)
 set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
@@ -106,7 +107,7 @@ LOG: MAIN
 set_process_info: pppp running queue: waiting for children of pppp
 set_process_info: pppp running queue
 set_process_info: pppp running queue: 10HmaY-0005vi-00-H
-set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp)
+set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid pppp)
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> usery@test.ex <--------
 set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
@@ -119,14 +120,14 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = unusable
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
-added to list for 127.0.0.1
+added 10HmaY-0005vi-00 to queue for 127.0.0.1
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.ex in subprocess)
 set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)
 set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaY-0005vi-00
 LOG: retry_defer MAIN
-  == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host for 'test.ex'
+  == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex'
 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 set_process_info: pppp running queue: waiting for children of pppp