Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index 277281cc5abd2efa80d21a490a093f515e956f5d..f80f2889510b3a7a72c97bea0e8d531e37efd4a0 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -1,6 +1,7 @@
 
 ******** SERVER ********
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -8,47 +9,49 @@ daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
  TESTSUITE/spool/exim_daemon_notify
-listening on all interfaces (IPv4) port 1225
+listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.pid
 LOG: MAIN
-  exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Connection request from 127.0.0.1 port sssss
-LOG: smtp_connection MAIN
-  SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
+p1235 LOG: smtp_connection MAIN
+p1235   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
 p1235 Process p1235 is handling incoming connection from [127.0.0.1]
 p1235 Process p1235 is ready for new message
+p1235 test in helo_lookup_domains? no (end of list)
 p1235 using ACL "delay4_accept"
-p1235 processing "accept" (TESTSUITE/test-config 24)
+p1235 processing ACL delay4_accept "accept" (TESTSUITE/test-config 24)
 p1235 check delay = 4s
 p1235 delay modifier requests 4-second delay
-p1236 SMTP accept process running
+1 SMTP accept process running
 Listening...
-p1235 accept: condition test succeeded in ACL "delay4_accept"
-p1235 end of ACL "delay4_accept": ACCEPT
+p1235 accept: condition test succeeded in ACL delay4_accept
+p1235 end of ACL delay4_accept: ACCEPT
 p1235 LOG: smtp_connection MAIN
-p1235   SMTP connection from (test) [127.0.0.1] closed by QUIT
+p1235   SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT
 p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 child p1235 ended: status=0x0
   normal exit, 0
-p1237 SMTP accept processes now running
+0 SMTP accept processes now running
 Listening...
 Connection request from 127.0.0.1 port sssss
-LOG: smtp_connection MAIN
-  SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-p1238 Process p1238 is handling incoming connection from [127.0.0.1]
-p1238 Process p1238 is ready for new message
-p1238 using ACL "delay4_accept"
-p1238 processing "accept" (TESTSUITE/test-config 24)
-p1238 check delay = 4s
-p1238 delay modifier requests 4-second delay
-p1238 delay cancelled by peer close
-p1238 accept: condition test succeeded in ACL "delay4_accept"
-p1238 end of ACL "delay4_accept": ACCEPT
-p1238 LOG: lost_incoming_connection MAIN
-p1238   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
-p1238 >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
-p1236 SMTP accept process running
+p1236 LOG: smtp_connection MAIN
+p1236   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
+p1236 Process p1236 is handling incoming connection from [127.0.0.1]
+p1236 Process p1236 is ready for new message
+p1236 test in helo_lookup_domains? no (end of list)
+p1236 using ACL "delay4_accept"
+p1236 processing ACL delay4_accept "accept" (TESTSUITE/test-config 24)
+p1236 check delay = 4s
+p1236 delay modifier requests 4-second delay
+p1236 delay cancelled by peer close
+p1236 accept: condition test succeeded in ACL delay4_accept
+p1236 end of ACL delay4_accept: ACCEPT
+p1236 LOG: lost_incoming_connection MAIN
+p1236   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
+p1236 >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
+1 SMTP accept process running
 SIGTERM/SIGINT seen
 >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>