Remove empty lines from .mailmap, fix root

[exim.git] / test / stderr / 0396

diff --git a/test/stderr/0396 b/test/stderr/0396
index 072e3d49756e94ad80f081b9cb527b281c8bd23e..24b785652fc960de26907a2ea1a7fff12ddf7f40 100644 (file)
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -11,23 +11,23 @@ set_process_info: pppp accepting a local SMTP message from <CALLER@the.local.hos
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 check domains = +fail
 expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
 y in "+fail"? no (end of list)
-accept: condition test failed
+accept: condition test failed in inline ACL
 end of inline ACL: implicit DENY
-SMTP>> 550 Administrative prohibition\r
+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <x@y>
 created log directory TESTSUITE/spool/log
 SMTP<< quit
-SMTP>> 221 the.local.host.name closing connection\r
+SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called