TLS: fix resumption for TLS-on-connect

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index 6768091382f12b2f5c0ee69315f7ff3bbae08335..2ea697f699b536534bf33c6d02cb85fba29fb43f 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -15,8 +15,8 @@ LOG: MAIN
 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
 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 using ACL "delay4_accept"
 p1235 Process p1235 is handling incoming connection from [127.0.0.1]
 p1235 Process p1235 is ready for new message
 p1235 using ACL "delay4_accept"


@@ -28,15 +28,15 @@ Listening...
 p1235 accept: condition test succeeded in ACL "delay4_accept"
 p1235 end of ACL "delay4_accept": ACCEPT
 p1235 LOG: smtp_connection MAIN
 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
 0 SMTP accept processes now running
 Listening...
 Connection request from 127.0.0.1 port sssss
 p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 child p1235 ended: status=0x0
   normal exit, 0
 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)
+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 using ACL "delay4_accept"
 p1236 Process p1236 is handling incoming connection from [127.0.0.1]
 p1236 Process p1236 is ready for new message
 p1236 using ACL "delay4_accept"