Fix taint hybrid-checking on BSD

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

diff --git a/test/stderr/0476 b/test/stderr/0476
index 6868a902c7b786874c26e5928338c676e682f937..9c6466e9d1a0fc2398a5c0e8e421bf8b203f2e83 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -1,6 +1,7 @@
 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

 set_process_info: pppp running the queue (single queue run)
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 set_process_info: pppp running the queue (single queue run)
 LOG: queue_run MAIN
   Start queue run: pid=pppp


@@ -13,12 +14,12 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
 t1 transport entered
   userx@test.ex
 hostlist:
 t1 transport entered
   userx@test.ex
 hostlist:

-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1

 checking status of 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)

-set_process_info: pppp 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]:1224 ... connected
+set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex)
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected

   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
 cmd buf flush ddd bytes
   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
 cmd buf flush ddd bytes


@@ -31,8 +32,12 @@ not using DSN
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes

+sync_responses expect mail

   SMTP<< 250 OK
   SMTP<< 250 OK

+sync_responses expect rcpt

   SMTP<< 550 NO
   SMTP<< 550 NO

+sync_responses expect data
+  SMTP(closed)<<

 Remote host closed connection in response to pipelined DATA
 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
 Remote host closed connection in response to pipelined DATA
 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


@@ -40,9 +45,10 @@ transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
   SMTP>> RSET
 cmd buf flush ddd bytes
   sequence=1 local_max=500 global_max=-1
   SMTP>> RSET
 cmd buf flush ddd bytes

+  SMTP(closed)<<

 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
   SMTP(close)>>
 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
   SMTP(close)>>

-set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@test.ex: result OK
+set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK

 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)
 set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)
 set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish


@@ -50,6 +56,7 @@ 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
 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
 writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -62,6 +69,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

 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaZ-0005vi-00
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaZ-0005vi-00
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>


@@ -70,15 +78,15 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
 t1 transport entered
   CALLER@the.local.host.name
 hostlist:
 t1 transport entered
   CALLER@the.local.host.name
 hostlist:

-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1

 checking status of 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 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
 delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)

-set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
+set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name)
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused

 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused

-set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@the.local.host.name: result DEFER
+set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER

 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 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


@@ -90,8 +98,8 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00
 LOG: MAIN
   == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused
 set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00
 LOG: MAIN
   == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused
 set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00

->>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>

 LOG: MAIN
   Completed
 set_process_info: pppp running queue: waiting for children of pppp
 LOG: MAIN
   Completed
 set_process_info: pppp running queue: waiting for children of pppp


@@ -105,10 +113,10 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
 t1 transport entered
   usery@test.ex
 hostlist:
 t1 transport entered
   usery@test.ex
 hostlist:

-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1

 checking status of 127.0.0.1
 no message retry record
 checking status of 127.0.0.1
 no message retry record

-127.0.0.1 [127.0.0.1]:1111 status = unusable
+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
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
 added to list for 127.0.0.1


@@ -123,4 +131,4 @@ set_process_info: pppp running queue: waiting for children of pppp
 set_process_info: pppp running queue
 LOG: queue_run MAIN
   End queue run: pid=pppp
 set_process_info: pppp running queue
 LOG: queue_run MAIN
   End queue run: pid=pppp

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