Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / stderr / 0467

diff --git a/test/stderr/0467 b/test/stderr/0467
index 60aed5cd34e3225de9bad42d79bc6c2bb61ffc53..8d2018ee71589dd9032ab570e5a79ba768763401 100644 (file)
--- a/test/stderr/0467
+++ b/test/stderr/0467
@@ -2,14 +2,14 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN

-  *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25
+  *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25 C="delivery bypassed by -N option"

 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
 LOG: MAIN
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
 LOG: MAIN

-  *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88
+  *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88 C="delivery bypassed by -N option"

 LOG: MAIN
   Completed
 LOG: MAIN
 LOG: MAIN
   Completed
 LOG: MAIN


@@ -30,7 +30,8 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected
   SMTP>> writing message and terminating "."
   SMTP<< 250 OK
   SMTP>> QUIT
   SMTP>> writing message and terminating "."
   SMTP<< 250 OK
   SMTP>> QUIT

+  SMTP(close)>>

 LOG: MAIN
 LOG: MAIN

-  => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224
+  => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK"

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed