hosts_require_helo

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index a6027e8e7b68a7d5ff5f8aa258f576f59c7c8eae..f8b8aee0b5dc58c39b5b607003b8596199203a35 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -17,20 +17,18 @@ ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp daemon forking for daemon-accept
-ppppp daemon forked for daemon-accept: npppp
-ppppp 1 SMTP accept process running
-ppppp Listening...
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp using ACL "delay4_accept"
 ppppp processing "accept" (TESTSUITE/test-config 24)
 ppppp check delay = 4s
 ppppp delay modifier requests 4-second delay
+ppppp 1 SMTP accept process running
+ppppp Listening...
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: smtp_connection MAIN
-ppppp   SMTP connection from [127.0.0.1] closed by QUIT
+ppppp   SMTP connection from (test) [127.0.0.1] closed by QUIT
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
@@ -39,10 +37,6 @@ ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp daemon forking for daemon-accept
-ppppp daemon forked for daemon-accept: npppp
-ppppp 1 SMTP accept process running
-ppppp Listening...
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp using ACL "delay4_accept"
@@ -53,12 +47,8 @@ ppppp delay cancelled by peer close
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: lost_incoming_connection MAIN
-ppppp   unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+ppppp   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
-ppppp child ppppp ended: status=0x100
-ppppp   normal exit, 1
-ppppp 0 SMTP accept processes now running
-ppppp Listening...
-ppppp daemon forking for daemon-del-pidfile
-ppppp daemon forked for daemon-del-pidfile: npppp
+ppppp 1 SMTP accept process running
+ppppp SIGTERM/SIGINT seen
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>