git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build with DISABLE_EVENT (proper spelling)
[exim.git]
/
test
/
mail
/
0211.CALLER
diff --git
a/test/mail/0211.CALLER
b/test/mail/0211.CALLER
index c863f58b59f70d57813d9375269b4bafb697b343..930078abbce8b7f272035d6060e70d255582c1ca 100644
(file)
--- a/
test/mail/0211.CALLER
+++ b/
test/mail/0211.CALLER
@@
-1,16
+1,18
@@
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
- id 10HmaY-0005vi-00
- for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ id 10HmaY-000000005vi-0000
+ for CALLER@test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
X-Failed-Recipients: userx@domain1
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: CALLER@test.ex
X-Failed-Recipients: userx@domain1
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: CALLER@test.ex
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-000
5vi-
00@the.local.host.name>
+Message-Id: <E10HmaY-000
000005vi-00
00@the.local.host.name>
Date: Tue, 2 Mar 1999 09:44:33 +0000
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Date: Tue, 2 Mar 1999 09:44:33 +0000
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@
-22,9
+24,9
@@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
userx@domain1
recipients. This is a permanent error. The following address(es) failed:
userx@domain1
- host
127.0.0.1
[127.0.0.1]
+ host
localhost4.test.ex
[127.0.0.1]
SMTP error from remote mail server after initial connection:
SMTP error from remote mail server after initial connection:
- 550 Go away
+ 550 Go away
(A)
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/delivery-status
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/delivery-status
@@
-34,8
+36,8
@@
Reporting-MTA: dns; the.local.host.name
Action: failed
Final-Recipient: rfc822;userx@domain1
Status: 5.0.0
Action: failed
Final-Recipient: rfc822;userx@domain1
Status: 5.0.0
-Remote-MTA: dns;
127.0.0.1
-Diagnostic-Code: smtp; 550 Go away
+Remote-MTA: dns;
localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away
(A)
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
@@
-43,9
+45,10
@@
Content-type: message/rfc822
Return-path: <CALLER@test.ex>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
Return-path: <CALLER@test.ex>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
- id 10HmaX-0005vi-00
- for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+ id 10HmaX-000000005vi-0000
+ for userx@domain1;
+ Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
From: CALLER_NAME <CALLER@test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
@@
-56,17
+59,19
@@
Test message 1
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Return-path: <>
Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
- id 10HmbA-0005vi-00
- for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ id 10HmbA-000000005vi-0000
+ for CALLER@test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
X-Failed-Recipients: usery@domain2,
userx@domain1
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: CALLER@test.ex
X-Failed-Recipients: usery@domain2,
userx@domain1
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: CALLER@test.ex
+References: <E10HmaZ-000000005vi-0000@the.local.host.name>
Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-000
5vi-
00@the.local.host.name>
+Message-Id: <E10HmbA-000
000005vi-00
00@the.local.host.name>
Date: Tue, 2 Mar 1999 09:44:33 +0000
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Date: Tue, 2 Mar 1999 09:44:33 +0000
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@
-78,13
+83,13
@@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
usery@domain2
recipients. This is a permanent error. The following address(es) failed:
usery@domain2
- host
127.0.0.1
[127.0.0.1]
+ host
localhost4.test.ex
[127.0.0.1]
SMTP error from remote mail server after HELO the.local.host.name:
SMTP error from remote mail server after HELO the.local.host.name:
- 550 Go away
+ 550 Go away
(C)
userx@domain1
userx@domain1
- host
127.0.0.1
[127.0.0.1]
+ host
localhost4.test.ex
[127.0.0.1]
SMTP error from remote mail server after HELO the.local.host.name:
SMTP error from remote mail server after HELO the.local.host.name:
- 550 Go away
+ 550 Go away
(C)
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/delivery-status
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/delivery-status
@@
-94,14
+99,14
@@
Reporting-MTA: dns; the.local.host.name
Action: failed
Final-Recipient: rfc822;userx@domain1
Status: 5.0.0
Action: failed
Final-Recipient: rfc822;userx@domain1
Status: 5.0.0
-Remote-MTA: dns;
127.0.0.1
-Diagnostic-Code: smtp; 550 Go away
+Remote-MTA: dns;
localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away
(C)
Action: failed
Final-Recipient: rfc822;usery@domain2
Status: 5.0.0
Action: failed
Final-Recipient: rfc822;usery@domain2
Status: 5.0.0
-Remote-MTA: dns;
127.0.0.1
-Diagnostic-Code: smtp; 550 Go away
+Remote-MTA: dns;
localhost4.test.ex
+Diagnostic-Code: smtp; 550 Go away
(C)
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
@@
-109,8
+114,9
@@
Content-type: message/rfc822
Return-path: <CALLER@test.ex>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
Return-path: <CALLER@test.ex>
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
- id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+ id 10HmaZ-000000005vi-0000;
+ Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
From: CALLER_NAME <CALLER@test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000