ARC: harden versus badly-formatted AMS line

[users/jgh/exim.git] / test / stderr / 0450

diff --git a/test/stderr/0450 b/test/stderr/0450
index 24e66a15219171260fab719de4c279d878fe3e27..7edba5367a25055d1f4e5bd8d479144a16c6302c 100644 (file)
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -8,6 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 t1 transport entered
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 t1 transport entered


@@ -15,9 +16,9 @@ t1 transport entered
 using the transport's hosts: 127.0.0.1
 getting address for 127.0.0.1
 checking status of 127.0.0.1
 using the transport's hosts: 127.0.0.1
 getting address for 127.0.0.1
 checking status of 127.0.0.1

-127.0.0.1 [127.0.0.1]:1111 status = usable
+127.0.0.1 [127.0.0.1]:1111 retry-status = usable

 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)

-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  failed: Connection refused

 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2


@@ -27,11 +28,12 @@ added to list for 127.0.0.1
 Leaving t1 transport
 LOG: MAIN
   == userx@test.ex R=r1 T=t1 defer (dd): Connection refused
 Leaving t1 transport
 LOG: MAIN
   == userx@test.ex R=r1 T=t1 defer (dd): Connection refused

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 LOG: queue_run MAIN
   Start queue run: pid=pppp
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>


@@ -43,9 +45,9 @@ getting address for 127.0.0.1
 checking status of 127.0.0.1
 no host retry record
 no message retry record
 checking status of 127.0.0.1
 no host retry record
 no message retry record

-127.0.0.1 [127.0.0.1]:1112 status = usable
+127.0.0.1 [127.0.0.1]:1112 retry-status = usable

 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)

-Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused
+Connecting to 127.0.0.1 [127.0.0.1]:1226 ...  failed: Connection refused

 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2


@@ -57,4 +59,4 @@ LOG: MAIN
   == userx@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: queue_run MAIN
   End queue run: pid=pppp
   == userx@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: queue_run MAIN
   End queue run: pid=pppp

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>