Merge branch 'exim-4.96+security'

[exim.git] / test / stderr / 3404

diff --git a/test/stderr/3404 b/test/stderr/3404
index 17af167bc4c774bef1bf5182cb7c8b960c77462b..51e88fac31c10181699dc94c9fd6131bee5021cf 100644 (file)
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 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
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -15,7 +15,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
   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>> .
   SMTP<< 250 OK
   SMTP+> QUIT


@@ -29,8 +29,8 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
   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
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -44,7 +44,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
   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>> .
   SMTP<< 250 OK
   SMTP+> QUIT


@@ -58,8 +58,8 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
   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
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -77,7 +77,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
   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>> .
   SMTP<< 250 OK
   SMTP+> QUIT