Merge branch 'hs/taintwarn'

[exim.git] / test / mail / 0026.userx

diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 67c1c080346dd51914cb5066bd03ab8a51cc45ac..2560fd0da2c6860bcc3e2b8fa4dd54e6a71433d3 100644 (file)
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -1,8 +1,10 @@
 From x@y Tue Mar 02 09:44:33 1999
 From x@y Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00

-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000


@@ -11,10 +13,12 @@ X-warning: this is a test warning
 Message 7
 
 From x@y Tue Mar 02 09:44:33 1999
 Message 7
 
 From x@y Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00

-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>


@@ -25,9 +29,11 @@ X-warning: this is a test warning
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmbH-0005vi-00
        id 10HmbH-0005vi-00

-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex