X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b48cf0793366791f5bdef8526a4956d4523c6778..d9de268dd629b0a01c6e01a6bc816dca51f76b12:/test/stderr/3404?ds=sidebyside

diff --git a/test/stderr/3404 b/test/stderr/3404
index a35594e44..51e88fac3 100644
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmaX-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -15,18 +15,22 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
+  SMTP<< 250 OK
+  SMTP+> QUIT
+  SMTP(shutdown)>>
   SMTP<< 250 OK
-  SMTP>> QUIT
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmaY-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -40,18 +44,22 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
+  SMTP<< 250 OK
+  SMTP+> QUIT
+  SMTP(shutdown)>>
   SMTP<< 250 OK
-  SMTP>> QUIT
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmaZ-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -69,10 +77,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
+  SMTP<< 250 OK
+  SMTP+> QUIT
+  SMTP(shutdown)>>
   SMTP<< 250 OK
-  SMTP>> QUIT
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:300:********:300:********:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=login C="250 OK"
 LOG: MAIN