Testsuite: fix 0173 and related

[users/heiko/exim.git] / test / stdout / 4015

diff --git a/test/stdout/4015 b/test/stdout/4015
index a1d7f2ea71e13cc3be5375b0be6bfd229a6e8d25..7e1d83e89d4ff17fba757afb6c7b004104d063bf 100644 (file)
--- a/test/stdout/4015
+++ b/test/stdout/4015
@@ -1,5 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

-250-myhost.test.ex Hello CALLER at test.ex\r
+250-myhost.test.ex Hello fromuser at test.ex\r

 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r


@@ -15,19 +15,19 @@ Listening on port 7833 ...
 Connection request from [127.0.0.1]
 <REPORT SPAMC/1.2
 <User: nobody
 Connection request from [127.0.0.1]
 <REPORT SPAMC/1.2
 <User: nobody

-<Content-length: 479
+<Content-length: 465

 <
 <From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 <
 <From MAILER-DAEMON Tue Mar 02 09:44:33 1999

-<X-Envelope-From: <CALLER@myhost.test.ex>
+<X-Envelope-From: <fromuser@myhost.test.ex>

 <X-Envelope-To: userx@test.ex
 <X-Envelope-To: userx@test.ex

-<Received: from CALLER (helo=test.ex)
+<Received: from fromuser (helo=test.ex)

 <      by myhost.test.ex with local-esmtp (Exim x.yz)
 <      by myhost.test.ex with local-esmtp (Exim x.yz)

-<      (envelope-from <CALLER@myhost.test.ex>)
+<      (envelope-from <fromuser@myhost.test.ex>)

 <      id 10HmaX-0005vi-00
 <      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 <      id 10HmaX-0005vi-00
 <      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

-<From: CALLER_NAME <CALLER@myhost.test.ex>
+<From: fromuser@myhost.test.ex

 <Date: Tue, 2 Mar 1999 09:44:33 +0000
 <
 <test
 <Date: Tue, 2 Mar 1999 09:44:33 +0000
 <
 <test