Merge branch 'master' into 4.next

[exim.git] / test / stderr / 3404

diff --git a/test/stderr/3404 b/test/stderr/3404
index 1ba6a254013e30b67f2075136702c8e431fe1163..d2fb903adc0c8609472b7ae132afd41074fae434 100644 (file)
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,8 @@
 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]:PORT_S ...  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
@@ -22,15 +23,16 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
-cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
+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]:PORT_S ...  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
@@ -51,15 +53,16 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
-cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
+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]:PORT_S ...  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
@@ -84,7 +87,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
-cmdlog: '220:EHLO:250-:AUTH:300:********:300:********:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
+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