Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0293

diff --git a/test/stderr/0293 b/test/stderr/0293
index a89c4b86a5e2ececcf21ed1511fa9421dabce10f..f53dae37993b49cd1ed58a08b1790b326276bc73 100644 (file)
--- a/test/stderr/0293
+++ b/test/stderr/0293
@@ -1,23 +1,23 @@
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
-  <= x@y U=CALLER P=local-smtp S=sss
-delivering 10HmaX-0005vi-00
+  <= x1@y U=CALLER P=local-smtp S=sss
+delivering 10HmaX-000000005vi-0000
 LOG: MAIN
   => one <one@z> R=r1 T=t1
 LOG: MAIN
   Completed
 LOG: MAIN
-  <= x@y U=CALLER P=local-smtp S=sss
+  <= x2@y U=CALLER P=local-smtp S=sss
 LOG: delay_delivery MAIN
   no immediate delivery: more than 1 messages received in one connection
 LOG: MAIN REJECT
   rejected MAIL command U=CALLER: too many messages in one connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN REJECT
   rejected MAIL command U=CALLER: too many messages in one connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT