Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / stderr / 0435

diff --git a/test/stderr/0435 b/test/stderr/0435
index d76e9aa8d5c756e1692bc345d02e6ff40ca65268..ad55c7e8f63ccad07230f82d37011719c729575b 100644 (file)
--- a/test/stderr/0435
+++ b/test/stderr/0435
@@ -11,15 +11,15 @@ set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.e
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< HELO    ?
 LOG: smtp_syntax_error MAIN
-  SMTP syntax error in "HELO    ?" U=CALLER NULL character(s) present (shown as '?')
-SMTP>> 501 NULL characters are not allowed in SMTP commands\r
+  SMTP syntax error in "HELO    ?" U=CALLER NUL character(s) present (shown as '?')
+SMTP>> 501 NUL characters are not allowed in SMTP commands
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>