From: John Jetmore Date: Fri, 4 Jun 2010 18:20:51 +0000 (+0000) Subject: With a few minor exceptions for tests that had additional concerns and tests I don... X-Git-Tag: exim-4_73_RC0~62 X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/b3f43fa01b5b8511bf22ff4781e6194cf2a5ab54 With a few minor exceptions for tests that had additional concerns and tests I don't have working in my environment yet, this should be the last of the header-order-related changes --- diff --git a/test/log/5100 b/test/log/5100 index e11d37c00..ec4a807ff 100644 --- a/test/log/5100 +++ b/test/log/5100 @@ -72,10 +72,10 @@ DATA <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz) <<< (envelope-from ) <<< id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 -<<< Message-Id: <<< script: 05 +<<< Message-Id: <<< From: CALLER_NAME +<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< <<< This is a test message. <<< . @@ -129,10 +129,10 @@ DATA <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz) <<< (envelope-from ) <<< id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 -<<< Message-Id: <<< script: 06 +<<< Message-Id: <<< From: CALLER_NAME +<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< <<< This is a test message. <<< . @@ -202,10 +202,10 @@ DATA <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz) <<< (envelope-from ) <<< id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 -<<< Message-Id: <<< script: 08 +<<< Message-Id: <<< From: CALLER_NAME +<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< <<< This is a test message. <<< . @@ -240,10 +240,10 @@ DATA <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz) <<< (envelope-from ) <<< id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 -<<< Message-Id: <<< script: 09 +<<< Message-Id: <<< From: CALLER_NAME +<<< Date: Tue, 2 Mar 1999 09:44:33 +0000 <<< <<< This is a test message. <<< . diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER index 0d795f636..1b73cc347 100644 --- a/test/mail/0005.CALLER +++ b/test/mail/0005.CALLER @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: someone@some.domain +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-acl-message-linecount: 4 X-local-user: uid=CALLER_UID gid=CALLER_GID X-body-linecount: 3 @@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: second +Message-Id: From: someone@some.domain +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-acl-message-linecount: 3 X-local-user: uid=CALLER_UID gid=CALLER_GID X-body-linecount: 1 @@ -47,11 +47,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: third Reply-to: some@body +Message-Id: From: someone@some.domain +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-acl-message-linecount: 4 X-local-user: uid=CALLER_UID gid=CALLER_GID X-body-linecount: 1 diff --git a/test/mail/0008.CALLER b/test/mail/0008.CALLER index 15ccf08ca..0a54f1f4d 100644 --- a/test/mail/0008.CALLER +++ b/test/mail/0008.CALLER @@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 from: someone@some.where To: CALLER@the.local.host.name Subject: testing Message-id: abcd%rxyz@p.q.r +Date: Tue, 2 Mar 1999 09:44:33 +0000 Here is testing data .that line started with a dot diff --git a/test/mail/0009.CALLER b/test/mail/0009.CALLER index c6bc2c961..b4806a18d 100644 --- a/test/mail/0009.CALLER +++ b/test/mail/0009.CALLER @@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: from: someone@some.where To: CALLER@the.local.host.name Subject: testing +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Here is testing data .that line started with a dot diff --git a/test/mail/0010.CALLER b/test/mail/0010.CALLER index c6bc2c961..b4806a18d 100644 --- a/test/mail/0010.CALLER +++ b/test/mail/0010.CALLER @@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: from: someone@some.where To: CALLER@the.local.host.name Subject: testing +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Here is testing data .that line started with a dot diff --git a/test/mail/0011.CALLER b/test/mail/0011.CALLER index c6bc2c961..b4806a18d 100644 --- a/test/mail/0011.CALLER +++ b/test/mail/0011.CALLER @@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: from: someone@some.where To: CALLER@the.local.host.name Subject: testing +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Here is testing data .that line started with a dot diff --git a/test/mail/0014.userx b/test/mail/0014.userx index 956382bd3..8844387dc 100644 --- a/test/mail/0014.userx +++ b/test/mail/0014.userx @@ -3,21 +3,21 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: aaa@bbb To: userx@myhost.test.ex, 1=x@zzery.query +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 From J.Caesar@plc.example Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: J.Caesar@plc.example To: userx@myhost.test.ex, J.Caesar@plc.example, J.Calendar@plc.example, unknown@plc.example Reply-to: J.Caesar@plc.example +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER index f617ace68..2f531e675 100644 --- a/test/mail/0015.CALLER +++ b/test/mail/0015.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: page+userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: CALLER X-local_part_prefix: @@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for page+userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. @@ -43,13 +43,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: page+userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: CALLER X-local_part_prefix: @@ -69,9 +69,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for page+ux@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some more message text. diff --git a/test/mail/0015.userx b/test/mail/0015.userx index 2112b7100..29b1e9a95 100644 --- a/test/mail/0015.userx +++ b/test/mail/0015.userx @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for page+userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: page+ @@ -21,13 +21,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: @@ -41,9 +41,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for page+ux@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: page+ @@ -56,13 +56,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: @@ -78,9 +78,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for B+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: b+ @@ -95,9 +95,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: @@ -111,9 +111,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local_part: userx X-local_part_prefix: x+ diff --git a/test/mail/0016.userx b/test/mail/0016.userx index 3f0451c3c..8e33c3631 100644 --- a/test/mail/0016.userx +++ b/test/mail/0016.userx @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx+page@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. @@ -19,13 +19,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 callpager -r 108 PAGE:Some message text. diff --git a/test/mail/0021.ok b/test/mail/0021.ok index e29b12832..213d0c60a 100644 --- a/test/mail/0021.ok +++ b/test/mail/0021.ok @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: ok@test2 Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -20,9 +20,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: ok@test2 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 3. @@ -30,12 +30,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbG-0005vi-00 for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: ok@test4 Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -48,9 +48,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: ok@test4 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 5. diff --git a/test/mail/0021.userx b/test/mail/0021.userx index b8b130f76..2abd8d315 100644 --- a/test/mail/0021.userx +++ b/test/mail/0021.userx @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: userx@test1 Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -20,9 +20,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: userx@test1 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1. @@ -31,9 +31,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: ok@test1 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 2. @@ -42,9 +42,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: ok@test3 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 4. @@ -52,12 +52,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbI-0005vi-00 for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: userx@test1 Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -68,12 +68,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbJ-0005vi-00 for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: userx@test1 Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -87,8 +87,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: userx@test1 +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0025.userx b/test/mail/0025.userx index 791a3266a..791683ab7 100644 --- a/test/mail/0025.userx +++ b/test/mail/0025.userx @@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 diff --git a/test/mail/0026.userx b/test/mail/0026.userx index c9a8874b4..4c7822197 100644 --- a/test/mail/0026.userx +++ b/test/mail/0026.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: x@y +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning Message 7 @@ -15,11 +15,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: to: group name: x@y, p@q; reply-to: group name: a@b, c@d; +Message-Id: From: x@y +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning Message 10 @@ -28,11 +28,11 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: to: group name: x@y, p@q; reply-to: group name:; from: userx@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning Message 11 diff --git a/test/mail/0031.CALLER b/test/mail/0031.CALLER index ef8774a37..d996dc047 100644 --- a/test/mail/0031.CALLER +++ b/test/mail/0031.CALLER @@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@one.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 1. diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER index 2c3c866be..95051c4d9 100644 --- a/test/mail/0032.CALLER +++ b/test/mail/0032.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@mxt1.test.ex Auto-Submitted: auto-replied From: MailProgram To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@mxt1.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. diff --git a/test/mail/0036.abcd b/test/mail/0036.abcd index 63fc8aad9..1c9503859 100644 --- a/test/mail/0036.abcd +++ b/test/mail/0036.abcd @@ -6,10 +6,10 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0036.userx b/test/mail/0036.userx index 63fc8aad9..1c9503859 100644 --- a/test/mail/0036.userx +++ b/test/mail/0036.userx @@ -6,10 +6,10 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER index d3aa4fbff..93711697d 100644 --- a/test/mail/0037.CALLER +++ b/test/mail/0037.CALLER @@ -5,8 +5,6 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: usery@test.ex, abcd@test.ex, userx@test.ex @@ -14,6 +12,8 @@ Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -33,10 +33,10 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should fail this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Fail this. @@ -48,14 +48,14 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbD-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@test.ex Subject: An auto reply: qualify_domain=test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a text line @@ -66,13 +66,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbF-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-pipe@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -89,10 +89,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for filter-pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (1) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -103,13 +103,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbH-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-file@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -126,10 +126,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for filter-file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (2) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -140,13 +140,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbJ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-lookup@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -163,10 +163,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for filter-lookup@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (3) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -177,13 +177,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbL-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-exists@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -200,10 +200,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbK-0005vi-00 for filter-exists@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (4) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -214,13 +214,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbN-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-readfile@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -237,10 +237,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbM-0005vi-00 for filter-readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (5) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -251,13 +251,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbP-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-run@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -274,10 +274,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbO-0005vi-00 for filter-run@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (6) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -288,14 +288,14 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbR-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME Subject: On vacation In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 this is vacation text @@ -306,13 +306,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbV-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: readfile@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -329,9 +329,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbU-0005vi-00 for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Should fail ${readfile in filter. @@ -343,13 +343,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmcB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter-stat@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -366,10 +366,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmcA-0005vi-00 for filter-stat@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should give filter error (7) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -380,13 +380,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmcD-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME Subject: Re: Very long ... xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0037.dff b/test/mail/0037.dff index a57f4833d..cf539f85e 100644 --- a/test/mail/0037.dff +++ b/test/mail/0037.dff @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbW-0005vi-00 for deliverfromfilter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 original_domain=test.ex original_local_part=system-filter parent_domain=test.ex diff --git a/test/mail/0037.postmaster b/test/mail/0037.postmaster index 90b2408e4..f7c2aea50 100644 --- a/test/mail/0037.postmaster +++ b/test/mail/0037.postmaster @@ -5,12 +5,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: Message frozen +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 10HmbA-0005vi-00 has been frozen by the system filter. subject was "should freeze this" @@ -28,12 +28,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbT-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: Message frozen +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 10HmbS-0005vi-00 has been frozen by the system filter. subject was "should freeze this" diff --git a/test/mail/0037.userx b/test/mail/0037.userx index 6243b66bb..8a5e9a1b5 100644 --- a/test/mail/0037.userx +++ b/test/mail/0037.userx @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: Test 1 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -21,10 +21,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: reply to this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Reply to this. @@ -37,10 +37,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should freeze this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex X-added: qualify_domain is test.ex @@ -54,10 +54,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbS-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should freeze this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex X-added: qualify_domain is test.ex @@ -71,9 +71,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbX-0005vi-00 for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex diff --git a/test/mail/0037.userz b/test/mail/0037.userz index ec8423188..ae2f0e01a 100644 --- a/test/mail/0037.userz +++ b/test/mail/0037.userz @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: Test 1 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex @@ -20,10 +20,10 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should fail this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Fail this. @@ -36,10 +36,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should freeze this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Freeze this. @@ -52,10 +52,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: reply to this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Reply to this. @@ -68,10 +68,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbS-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should freeze this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Freeze this (second message). @@ -84,9 +84,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbU-0005vi-00 for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Should fail ${readfile in filter. @@ -99,10 +99,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: should defer this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-added: qualify_domain is test.ex Defer this. diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER index 9050b95ee..11101b61d 100644 --- a/test/mail/0048.CALLER +++ b/test/mail/0048.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: pipe@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -57,9 +57,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. @@ -72,9 +72,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. @@ -85,13 +85,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: prefixed+pipe@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -137,9 +137,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for prefixed+pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text @@ -152,9 +152,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for prefixed+pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text @@ -165,13 +165,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: pipe-suffixed@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -217,9 +217,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text @@ -232,9 +232,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text @@ -245,13 +245,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbE-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: prefixed+pipe-suffixed@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -297,9 +297,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for prefixed+pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text @@ -312,9 +312,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for prefixed+pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text @@ -325,13 +325,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbG-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: pipe@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -377,9 +377,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. @@ -392,9 +392,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. diff --git a/test/mail/0049.userx b/test/mail/0049.userx index 2028319ea..c6e4b19f9 100644 --- a/test/mail/0049.userx +++ b/test/mail/0049.userx @@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -20,9 +20,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -34,9 +34,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -48,9 +48,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -62,9 +62,9 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -76,10 +76,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: From person +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -91,10 +91,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: From person +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -106,10 +106,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: From person +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -121,10 +121,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: From person +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -136,10 +136,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: From person +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. diff --git a/test/mail/0050.userx b/test/mail/0050.userx index 706b3c3b7..4d209dcd1 100644 --- a/test/mail/0050.userx +++ b/test/mail/0050.userx @@ -6,10 +6,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 1. @@ -21,10 +21,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: userx@outside.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 2. @@ -36,10 +36,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: userx@outside.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 3. @@ -51,10 +51,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: userx@elsewhere.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 4. @@ -66,10 +66,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: userx@cus.cam.ac.uk +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 5. @@ -81,10 +81,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 6. @@ -96,10 +96,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 7. @@ -111,9 +111,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 8. @@ -125,10 +125,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 9. @@ -140,10 +140,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 10. @@ -155,10 +155,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 11. diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER index 04882a83d..322a48d74 100644 --- a/test/mail/0051.CALLER +++ b/test/mail/0051.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmaZ-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@bad.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@bad.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 2. @@ -41,13 +41,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmbB-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@badbad.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -64,9 +64,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@badbad.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 3. @@ -77,13 +77,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@domain4.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -100,9 +100,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@domain4.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 5. @@ -113,13 +113,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmbG-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@domain2.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -136,9 +136,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@domain2.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 6. diff --git a/test/mail/0051.userx b/test/mail/0051.userx index e03511072..7e0caa91c 100644 --- a/test/mail/0051.userx +++ b/test/mail/0051.userx @@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 1. @@ -20,9 +20,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@domain1.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 4. @@ -34,9 +34,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 for userx@xx.domain5.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 7. @@ -48,9 +48,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for userx@domain6.yy.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 8. diff --git a/test/mail/0052.!one b/test/mail/0052.!one index b517d8a40..9e4c91494 100644 --- a/test/mail/0052.!one +++ b/test/mail/0052.!one @@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for !one@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 3. diff --git a/test/mail/0052.CALLER b/test/mail/0052.CALLER index 6cd2cdefd..7e0fb955d 100644 --- a/test/mail/0052.CALLER +++ b/test/mail/0052.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: xx99@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for xx99@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 1. @@ -41,13 +41,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by myhost.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: !two@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -64,9 +64,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for !two@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 4. diff --git a/test/mail/0052.yy99 b/test/mail/0052.yy99 index b79785c20..1ebddcbe9 100644 --- a/test/mail/0052.yy99 +++ b/test/mail/0052.yy99 @@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for yy99@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message 2. diff --git a/test/mail/0055.userx b/test/mail/0055.userx index 975e3db7e..d31bc4ab2 100644 --- a/test/mail/0055.userx +++ b/test/mail/0055.userx @@ -6,8 +6,8 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0072.CALLER b/test/mail/0072.CALLER index 7ea62885b..5199f679a 100644 --- a/test/mail/0072.CALLER +++ b/test/mail/0072.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to first message; non-printer >\n < @@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to third message @@ -38,10 +38,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: third message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This has return_message set. @@ -52,13 +52,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbD-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to third message @@ -73,13 +73,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbF-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to third message @@ -89,10 +89,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: third message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 @@ -102,13 +102,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbH-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to Encoded from diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER index 5b42d0548..45eac6bfe 100644 --- a/test/mail/0073.CALLER +++ b/test/mail/0073.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to first message @@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to third message diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER index 28c9f6a9e..667c73139 100644 --- a/test/mail/0074.CALLER +++ b/test/mail/0074.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Auto reply to first message @@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Auto reply to third message diff --git a/test/mail/0074.userx b/test/mail/0074.userx index 637092558..fb5be8ac1 100644 --- a/test/mail/0074.userx +++ b/test/mail/0074.userx @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: first message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: second message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -34,10 +34,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: third message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -48,11 +48,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: fourth message X-nltest: xxxx +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 @@ -61,13 +61,13 @@ Envelope-to: userx@test.ex Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex, abey seedy In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing, testing @@ -79,12 +79,12 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: fifth message Reply-to: userx@test.ex, abcd@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 @@ -93,13 +93,13 @@ Envelope-to: userx@test.ex Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex, abcd@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 To reply-to diff --git a/test/mail/0075.subdir/userx b/test/mail/0075.subdir/userx index b30566ab4..40bcd43f7 100644 --- a/test/mail/0075.subdir/userx +++ b/test/mail/0075.subdir/userx @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: first message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0079.userx b/test/mail/0079.userx index a76777584..7a5b5233c 100644 --- a/test/mail/0079.userx +++ b/test/mail/0079.userx @@ -33,10 +33,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: sysmail: yes +Message-Id: From: postmaster@exim.test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing mail from system filter @@ -47,13 +47,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbA-0005vi-00 for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@exim.test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER@exim.test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 testing testing diff --git a/test/mail/0081.userx b/test/mail/0081.userx index 417bb1ec3..4f0d895b0 100644 --- a/test/mail/0081.userx +++ b/test/mail/0081.userx @@ -6,8 +6,6 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-one: This is the first text. To: userx@exim.test.ex X-one: This is the second text. @@ -15,6 +13,8 @@ From: userx@exim.test.ex X-one: This is the third text. Subject: testing, testing X-one: This is the fourth text. +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the message body. diff --git a/test/mail/0082.userx b/test/mail/0082.userx index 4f81ce483..171166279 100644 --- a/test/mail/0082.userx +++ b/test/mail/0082.userx @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with testproto (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: from: me@the.local.host.name To: me@the.local.host.name +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Proto: testproto This is some text diff --git a/test/mail/0083.userx b/test/mail/0083.userx index 3af56820c..994175b68 100644 --- a/test/mail/0083.userx +++ b/test/mail/0083.userx @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: from: me@the.local.host.name To: me@the.local.host.name +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Proto: local-bsmtp This is some text diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER index c778822b7..14156674a 100644 --- a/test/mail/0090.CALLER +++ b/test/mail/0090.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@myhost.test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is an autogenerated message. diff --git a/test/mail/0095.userx b/test/mail/0095.userx index 238daeb36..bd5e61c81 100644 --- a/test/mail/0095.userx +++ b/test/mail/0095.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message @@ -14,11 +14,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: quota: 0 threshold: 10 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message @@ -27,11 +27,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: quota: 10K threshold: 900 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A test message @@ -39,13 +39,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From : p@q Reply-To: a@b To: userx@myhost.test.ex Subject: Your mailbox +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Your mailbox has crossed the threshold @@ -54,11 +54,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: quota: 2200 threshold: 90% +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message @@ -66,13 +66,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Reply-To: x@y Auto-Submitted: auto-replied From: Mail Delivery System To: userx@myhost.test.ex Subject: Your mailbox +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message is automatically created by mail delivery software (Exim). @@ -84,9 +84,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -194,9 +194,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/test/mail/0095.userz b/test/mail/0095.userz index 2720b972d..f10b3ea30 100644 --- a/test/mail/0095.userz +++ b/test/mail/0095.userz @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: threshold: 330 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/test/mail/0095.userz.bounce b/test/mail/0095.userz.bounce index bf73931fe..840e40fd5 100644 --- a/test/mail/0095.userz.bounce +++ b/test/mail/0095.userz.bounce @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbH-0005vi-00 for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: userz@myhost.test.ex Subject: Your mailbox +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa This message is automatically created by mail delivery software (Exim). diff --git a/test/mail/0096.userx b/test/mail/0096.userx index 2cb54cc5b..1dadfc4ce 100644 --- a/test/mail/0096.userx +++ b/test/mail/0096.userx @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: First message subject +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-RBL-Warning: A faked up RBL header +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: xxxx diff --git a/test/mail/0097.userx b/test/mail/0097.userx index 299a89e32..1c062a264 100644 --- a/test/mail/0097.userx +++ b/test/mail/0097.userx @@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: First message subject +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-RBL-Warning: A faked up RBL header +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: by router Added: by transport diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER index ecf48dad0..532931db0 100644 --- a/test/mail/0098.CALLER +++ b/test/mail/0098.CALLER @@ -5,12 +5,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. A message that you sent has not yet been delivered to one or more of its @@ -38,12 +38,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. A message that you sent has not yet been delivered to one or more of its @@ -71,12 +71,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. A message that you sent has not yet been delivered to one or more of its @@ -104,12 +104,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbE-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmaX-0005vi-00 delayed by 10 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 warn_message_delay = 10 minutes warn_message_recipients = CALLER@test.ex @@ -132,12 +132,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbF-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 warn_message_delay = 0 minutes warn_message_recipients = CALLER@test.ex @@ -160,12 +160,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbG-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmbB-0005vi-00 delayed by 0 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 warn_message_delay = 0 minutes warn_message_recipients = CALLER@test.ex @@ -185,12 +185,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbH-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Warning: message 10HmbD-0005vi-00 delayed by 0 minutes +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 warn_message_delay = 0 minutes warn_message_recipients = CALLER@test.ex diff --git a/test/mail/0100.CALLER b/test/mail/0100.CALLER index fbfaf7da0..49db745bf 100644 --- a/test/mail/0100.CALLER +++ b/test/mail/0100.CALLER @@ -6,9 +6,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbK-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing . a line starting with a dot diff --git a/test/mail/0100.userw b/test/mail/0100.userw index 15bffa91f..3906e41a9 100644 --- a/test/mail/0100.userw +++ b/test/mail/0100.userw @@ -9,9 +9,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userw@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/mail/0100.userx b/test/mail/0100.userx index c00830065..1de79e03f 100644 --- a/test/mail/0100.userx +++ b/test/mail/0100.userx @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message >From the deep abyss @@ -26,9 +26,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -168,9 +168,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -310,9 +310,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -452,9 +452,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Last line ending without a newline and with a partial match: From @@ -468,9 +468,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message >From the deep abyss @@ -489,9 +489,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Last line ending without a newline and with a partial match: From @@ -504,9 +504,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Last line ending without a newline and being a single dot: . @@ -516,9 +516,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbJ-0005vi-00 for mmdf-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Line consisting of four ^A characters  @@ -532,10 +532,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbL-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: From +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 >From is the very first word of the message. >From starts the second line. diff --git a/test/mail/0100.usery b/test/mail/0100.usery index f79004b7a..a7f470978 100644 --- a/test/mail/0100.usery +++ b/test/mail/0100.usery @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message From the deep abyss diff --git a/test/mail/0100.userz b/test/mail/0100.userz index 8d7d5afa5..41f2f9883 100644 --- a/test/mail/0100.userz +++ b/test/mail/0100.userz @@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/mail/0101.userx b/test/mail/0101.userx index a9bf95600..4848398b4 100644 --- a/test/mail/0101.userx +++ b/test/mail/0101.userx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message >From the deep abyss @@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -159,9 +159,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -298,9 +298,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -437,9 +437,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Last line ending without a newline and with a partial match: From @@ -453,9 +453,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message From the deep abyss @@ -474,9 +474,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Last line ending without a newline and with a partial match: From @@ -486,9 +486,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Last line ending without a newline and being a single dot: . @@ -498,9 +498,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 for mmdf-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Line consisting of four ^A characters  @@ -511,10 +511,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: From +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 >From is the very first word of the message. >From starts the second line. diff --git a/test/mail/0101.userz b/test/mail/0101.userz index 81763e04a..a340c343f 100644 --- a/test/mail/0101.userz +++ b/test/mail/0101.userz @@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/mail/0102.batched b/test/mail/0102.batched index acfab6b94..2160dc31c 100644 --- a/test/mail/0102.batched +++ b/test/mail/0102.batched @@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for batch-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test to batch-userx . @@ -18,9 +18,9 @@ DATA Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test to batch-userx and batch-usery . diff --git a/test/mail/0102.userx b/test/mail/0102.userx index 2131c6497..2b5ed9885 100644 --- a/test/mail/0102.userx +++ b/test/mail/0102.userx @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Initial test message, no prefix. @@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix. diff --git a/test/mail/0102.usery b/test/mail/0102.usery index 0e4d34cf1..b3cca92ca 100644 --- a/test/mail/0102.usery +++ b/test/mail/0102.usery @@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for bsmtp_usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message with bsmtp_ prefix . @@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix. . diff --git a/test/mail/0102.userz b/test/mail/0102.userz index c32c363cf..2a8c4ad7f 100644 --- a/test/mail/0102.userz +++ b/test/mail/0102.userz @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for mmdf_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message with mmdf_ prefix  @@ -14,9 +14,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix.  @@ -25,9 +25,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix.  diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER index ba79910f9..f8ac3c475 100644 --- a/test/mail/0103.CALLER +++ b/test/mail/0103.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: WASabc@x.y.zWAS Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -26,9 +26,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for "abc@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message sent to "abc@x.y.z"@test.ex. @@ -36,13 +36,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbD-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: ":fail: fail message"@special Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -59,9 +59,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for ":fail: fail message"@special; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message sent to ":fail: fail message"@special diff --git a/test/mail/0103.rewritten b/test/mail/0103.rewritten index 17b6118eb..c01a105ab 100644 --- a/test/mail/0103.rewritten +++ b/test/mail/0103.rewritten @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for "xyz@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message sent to "xyz@x.y.z"@test.ex. diff --git a/test/mail/0104.mmm b/test/mail/0104.mmm index 44da90838..bc9255776 100644 --- a/test/mail/0104.mmm +++ b/test/mail/0104.mmm @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for mmm@ten-1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: You +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0104.yyy b/test/mail/0104.yyy index 3aa7b0dd6..4096709e3 100644 --- a/test/mail/0104.yyy +++ b/test/mail/0104.yyy @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for yyy@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: comment +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0105.default b/test/mail/0105.default index 378448212..d6218632d 100644 --- a/test/mail/0105.default +++ b/test/mail/0105.default @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Delivered to default diff --git a/test/mail/0105.firstuser b/test/mail/0105.firstuser index 73c535b1e..98088c7d9 100644 --- a/test/mail/0105.firstuser +++ b/test/mail/0105.firstuser @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for firstuser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Delivered to firstuser diff --git a/test/mail/0105.seconduser b/test/mail/0105.seconduser index 36a2d316f..90f98df37 100644 --- a/test/mail/0105.seconduser +++ b/test/mail/0105.seconduser @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for seconduser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Delivered to seconduser diff --git a/test/mail/0110.second b/test/mail/0110.second index b9b03a45f..3f228bef7 100644 --- a/test/mail/0110.second +++ b/test/mail/0110.second @@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0111.userx b/test/mail/0111.userx index 52e400758..9f535da71 100644 --- a/test/mail/0111.userx +++ b/test/mail/0111.userx @@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Forward: userx X-Alias: philip @@ -17,9 +17,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for Philip@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Alias: philip X-Forward: userx @@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for philip@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Alias: philip X-Forward: userx diff --git a/test/mail/0112.file b/test/mail/0112.file index 73574e98d..7bc02a7a6 100644 --- a/test/mail/0112.file +++ b/test/mail/0112.file @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to file. diff --git a/test/mail/0112.pipe b/test/mail/0112.pipe index 70591d67c..3f86bc8ae 100644 --- a/test/mail/0112.pipe +++ b/test/mail/0112.pipe @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to pipe. diff --git a/test/mail/0113.second b/test/mail/0113.second index b9b03a45f..3f228bef7 100644 --- a/test/mail/0113.second +++ b/test/mail/0113.second @@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0114.file b/test/mail/0114.file index ebd205b1b..a04c45d00 100644 --- a/test/mail/0114.file +++ b/test/mail/0114.file @@ -3,23 +3,23 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to file. From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: A. File , No One Subject: autoreply In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test Text diff --git a/test/mail/0114.pipe b/test/mail/0114.pipe index 70591d67c..3f86bc8ae 100644 --- a/test/mail/0114.pipe +++ b/test/mail/0114.pipe @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to pipe. diff --git a/test/mail/0115.file b/test/mail/0115.file index 021c3cd7a..cce750388 100644 --- a/test/mail/0115.file +++ b/test/mail/0115.file @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Home-Dir: Message to userx. @@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for one-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Home-Dir: TESTSUITE/aux-fixed Message to one-userx. @@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for two-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Home-Dir: /tmp Message to two-userx. @@ -39,9 +39,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for three-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Home-Dir: Message to three-userx. diff --git a/test/mail/0116.acopy b/test/mail/0116.acopy index a07b9fee5..e9c3e763e 100644 --- a/test/mail/0116.acopy +++ b/test/mail/0116.acopy @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: data from copyalias Message sent to acopy. diff --git a/test/mail/0116.alias1 b/test/mail/0116.alias1 index a07b9fee5..e9c3e763e 100644 --- a/test/mail/0116.alias1 +++ b/test/mail/0116.alias1 @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: data from copyalias Message sent to acopy. diff --git a/test/mail/0116.alias2 b/test/mail/0116.alias2 index a07b9fee5..e9c3e763e 100644 --- a/test/mail/0116.alias2 +++ b/test/mail/0116.alias2 @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: data from copyalias Message sent to acopy. diff --git a/test/mail/0116.dcopy b/test/mail/0116.dcopy index 4899c4d22..d53ee0bea 100644 --- a/test/mail/0116.dcopy +++ b/test/mail/0116.dcopy @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: data from copydeliver Message sent to dcopy. @@ -13,9 +13,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Added: data from copydeliver Message sent to dcopy. diff --git a/test/mail/0118.userx b/test/mail/0118.userx index 697244059..e3b863543 100644 --- a/test/mail/0118.userx +++ b/test/mail/0118.userx @@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0127.userx b/test/mail/0127.userx index 28b1f3150..364abefad 100644 --- a/test/mail/0127.userx +++ b/test/mail/0127.userx @@ -6,10 +6,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -21,10 +21,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -36,10 +36,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -51,10 +51,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -66,10 +66,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -81,10 +81,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -96,10 +96,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -111,10 +111,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -126,10 +126,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -141,10 +141,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: Sender in original From: From person +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. diff --git a/test/mail/0131.copy b/test/mail/0131.copy index 66daee4b0..798a7af6e 100644 --- a/test/mail/0131.copy +++ b/test/mail/0131.copy @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Address-Data: >-islocal-forward-forward-local< Test message diff --git a/test/mail/0131.userx b/test/mail/0131.userx index 94f4a9ba9..85a3958ce 100644 --- a/test/mail/0131.userx +++ b/test/mail/0131.userx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Address-Data: >-islocal-forward-islocal-local< Test message diff --git a/test/mail/0133.dddd b/test/mail/0133.dddd index e71139135..98c203b70 100644 --- a/test/mail/0133.dddd +++ b/test/mail/0133.dddd @@ -3,9 +3,9 @@ Envelope-to: userx@a.test.ex Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Final: dddd@a.test.ex Test message @@ -15,9 +15,9 @@ Envelope-to: usery@b.test.ex Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Final: dddd@test.ex Test message diff --git a/test/mail/0134.UC-USERX b/test/mail/0134.UC-USERX index 4273d8261..78e8ca8ee 100644 --- a/test/mail/0134.UC-USERX +++ b/test/mail/0134.UC-USERX @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for USERX@KNOWN.DOMAIN; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 domainlist: dd=data for known.domain lpd=data for userx domain_data: data for known.domain local_part_data: data for userx diff --git a/test/mail/0134.lc-unknown b/test/mail/0134.lc-unknown index 21d2c808f..4495f885d 100644 --- a/test/mail/0134.lc-unknown +++ b/test/mail/0134.lc-unknown @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 router: defaulted domain_data: local_part_data: @@ -16,9 +16,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 router: defaulted domain_data: local_part_data: @@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for UNKNOWN@KNOWN.DOMAIN; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 domain_data: local_part_data: diff --git a/test/mail/0134.lc-userx b/test/mail/0134.lc-userx index c1c6fa19b..0d8a3c837 100644 --- a/test/mail/0134.lc-userx +++ b/test/mail/0134.lc-userx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@unknown.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 router: defaulted domain_data: local_part_data: @@ -16,9 +16,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 smartuser: dd=data for test.ex lpd=data for userx domain_data: data for test.ex local_part_data: data for userx @@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@unknown.domain; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 domain_data: local_part_data: @@ -43,9 +43,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@known.domain; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 domainlist: dd=data for known.domain lpd=data for userx domain_data: data for known.domain local_part_data: data for userx diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder index 6df0a082e..9d74ba75e 100644 --- a/test/mail/0136.forwarder +++ b/test/mail/0136.forwarder @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaZ-0005vi-00 for forwarder@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: unknown@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: forwarder@test.ex Subject: Mail delivery failed +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -29,9 +29,9 @@ Return-path: Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: abcd@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message. @@ -39,13 +39,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbC-0005vi-00 for forwarder@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: unknown@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: forwarder@test.ex Subject: Mail delivery failed +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -66,8 +66,8 @@ Return-path: Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: abcd@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0137.userx b/test/mail/0137.userx index 7b7147c95..7dd068d10 100644 --- a/test/mail/0137.userx +++ b/test/mail/0137.userx @@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Transport: local_delivery +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 First message. @@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Transport: local_delivery +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second message @@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Transport: local_delivery_fcntl +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Third message @@ -39,10 +39,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Transport: local_delivery_fcntl_blocking +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Fourth message diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER index 468c76fc5..e7882aa43 100644 --- a/test/mail/0140.CALLER +++ b/test/mail/0140.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: Reply Person In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to first message; non-printer >< this is another line @@ -23,13 +23,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: reply2@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -45,9 +45,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for reply2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: first message; non-printer >< +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER index 7a937b1dc..a7d97c7a7 100644 --- a/test/mail/0142.CALLER +++ b/test/mail/0142.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: pipe@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -32,9 +32,9 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0142.filter b/test/mail/0142.filter index 3ecd4b929..7dca98165 100644 --- a/test/mail/0142.filter +++ b/test/mail/0142.filter @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message max fd = dddd diff --git a/test/mail/0150.postmaster b/test/mail/0150.postmaster index a0f66f537..eb51b1c2f 100644 --- a/test/mail/0150.postmaster +++ b/test/mail/0150.postmaster @@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: not.the.login@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0151.postmaster b/test/mail/0151.postmaster index d3454fa19..58f860c6d 100644 --- a/test/mail/0151.postmaster +++ b/test/mail/0151.postmaster @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: not.the.login@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0152.postmaster b/test/mail/0152.postmaster index 5facda3d2..2e2315621 100644 --- a/test/mail/0152.postmaster +++ b/test/mail/0152.postmaster @@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: not.the.login@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: page+CALLER@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -26,10 +26,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: call+CALLER@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -38,9 +38,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: call-CALLER@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -49,9 +49,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: CALLER&page@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -60,10 +60,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: CALLER&call@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -72,9 +72,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: CALLER=call@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -83,9 +83,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: page+CALLER=call@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER index ce3f8be09..208c76272 100644 --- a/test/mail/0164.CALLER +++ b/test/mail/0164.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: system-filter Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -55,9 +55,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -69,22 +69,22 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: system-filter Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -130,9 +130,9 @@ USER=system-filter Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -143,8 +143,8 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER index 1f8c3fac7..4ede20de7 100644 --- a/test/mail/0165.CALLER +++ b/test/mail/0165.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: system-filter Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -55,9 +55,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -69,22 +69,22 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: system-filter Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -132,9 +132,9 @@ USER=system-filter Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -145,8 +145,8 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0166.userx b/test/mail/0166.userx index 44c5b43b7..3c58c0da1 100644 --- a/test/mail/0166.userx +++ b/test/mail/0166.userx @@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Delivered-To: a@test.ex X-Delivered-To: b@test.ex X-Delivered-To: c@test.ex diff --git a/test/mail/0166.usery b/test/mail/0166.usery index b902efb37..529767368 100644 --- a/test/mail/0166.usery +++ b/test/mail/0166.usery @@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Delivered-To: a@test.ex X-Delivered-To: bb@test.ex X-Delivered-To: e@test.ex diff --git a/test/mail/0167.userx b/test/mail/0167.userx index f1d32cb83..c5ac0af4a 100644 --- a/test/mail/0167.userx +++ b/test/mail/0167.userx @@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 @@ -16,9 +16,9 @@ Envelope-to: userx@test.ex Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: remove@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 @@ -28,8 +28,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: trakill@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0169.userx b/test/mail/0169.userx index 6642d482e..34ff7fcd0 100644 --- a/test/mail/0169.userx +++ b/test/mail/0169.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message @@ -14,11 +14,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: quota: 0 threshold: 10 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message @@ -27,11 +27,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: quota: 50M threshold: 41% +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test diff --git a/test/mail/0171.CALLER b/test/mail/0171.CALLER index e053d52eb..74a65676a 100644 --- a/test/mail/0171.CALLER +++ b/test/mail/0171.CALLER @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 home: HOME=CALLER_HOME diff --git a/test/mail/0173.userx b/test/mail/0173.userx index 3178cb1ff..e5448334c 100644 --- a/test/mail/0173.userx +++ b/test/mail/0173.userx @@ -7,9 +7,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -21,9 +21,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test message diff --git a/test/mail/0173.usery b/test/mail/0173.usery index 00d5a68dc..f7da5ec65 100644 --- a/test/mail/0173.usery +++ b/test/mail/0173.usery @@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test message diff --git a/test/mail/0173.userz b/test/mail/0173.userz index 00d5a68dc..f7da5ec65 100644 --- a/test/mail/0173.userz +++ b/test/mail/0173.userz @@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test message diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER index faaa4bcaa..a20d75abf 100644 --- a/test/mail/0174.CALLER +++ b/test/mail/0174.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbD-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@non-local.example Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Yet another test message diff --git a/test/mail/0174.userx b/test/mail/0174.userx index a80da164d..8ef0afb6c 100644 --- a/test/mail/0174.userx +++ b/test/mail/0174.userx @@ -7,9 +7,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test message @@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Yet another test message diff --git a/test/mail/0174.usery b/test/mail/0174.usery index 6f5f5b4b3..e4bfa8a1e 100644 --- a/test/mail/0174.usery +++ b/test/mail/0174.usery @@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test message diff --git a/test/mail/0174.userz b/test/mail/0174.userz index 6f5f5b4b3..e4bfa8a1e 100644 --- a/test/mail/0174.userz +++ b/test/mail/0174.userz @@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz) Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another test message diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER index 292f12db6..0b5a23597 100644 --- a/test/mail/0176.CALLER +++ b/test/mail/0176.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: someone@somewhere Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for someone@somewhere; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message or other. diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER index caba89649..b40823a03 100644 --- a/test/mail/0177.CALLER +++ b/test/mail/0177.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,10 +25,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: fail this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message to be failed. diff --git a/test/mail/0177.userx b/test/mail/0177.userx index fceff433e..b1c66701f 100644 --- a/test/mail/0177.userx +++ b/test/mail/0177.userx @@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: reply to this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message to be replied to. @@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: freeze this (1) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message to be frozen. @@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: freeze this (2) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a second message to be frozen. diff --git a/test/mail/0177.usery b/test/mail/0177.usery index 999c0a5c2..2fc9e36ea 100644 --- a/test/mail/0177.usery +++ b/test/mail/0177.usery @@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaY-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: usery@test.ex Subject: auto fail message In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 failing userx@test.ex @@ -17,14 +17,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: usery@test.ex Subject: auto freeze message In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 freezing userx@test.ex @@ -32,14 +32,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbD-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: usery@test.ex Subject: An auto reply: qualify_domain=test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a text line @@ -47,14 +47,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbF-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: usery@test.ex Subject: auto freeze message In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 freezing userx@test.ex @@ -62,14 +62,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmbH-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: usery@test.ex Subject: auto freeze message In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 freezing userz@test.ex diff --git a/test/mail/0182.userx b/test/mail/0182.userx index b778e7efb..3c666c667 100644 --- a/test/mail/0182.userx +++ b/test/mail/0182.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Added: by system filter X-Added: by system filter diff --git a/test/mail/0189.userx b/test/mail/0189.userx index 1e391afc4..eda035d5b 100644 --- a/test/mail/0189.userx +++ b/test/mail/0189.userx @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message from an untrusted caller. @@ -18,10 +18,10 @@ Received: from root by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Sender: sender@some.domain +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message from a trusted caller.... diff --git a/test/mail/0192.userx b/test/mail/0192.userx index 9cf0b1bca..a55a9bb85 100644 --- a/test/mail/0192.userx +++ b/test/mail/0192.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: "Phil Q. Hazel" +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message which should get delivered. @@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: =?ISO-8859-1?Q?M=E8=E9_spaces=3A_funny=2C_char=5Facters?= +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message which should go over the threshold, but still be delivered. diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER index 016cbc71d..0a28b3f0e 100644 --- a/test/mail/0194.CALLER +++ b/test/mail/0194.CALLER @@ -2,8 +2,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userz@myhost.test.ex, usery@myhost.test.ex, userx@myhost.test.ex @@ -11,6 +9,8 @@ Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -35,9 +35,9 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -45,8 +45,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: seven@myhost.test.ex, six@myhost.test.ex, five@myhost.test.ex, @@ -58,6 +56,8 @@ Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -96,9 +96,9 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Here's another message. @@ -106,8 +106,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbD-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userz@myhost.test.ex, usery@myhost.test.ex, userx@myhost.test.ex @@ -115,6 +113,8 @@ Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -142,10 +142,10 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: ret: 99 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 More message 99 diff --git a/test/mail/0197.copies b/test/mail/0197.copies index 45966b188..49eeb21f2 100644 --- a/test/mail/0197.copies +++ b/test/mail/0197.copies @@ -5,9 +5,9 @@ DATA Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test one. . @@ -18,9 +18,9 @@ DATA Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: doesn't@matter +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test two. . diff --git a/test/mail/0202.userx b/test/mail/0202.userx index 68774bb98..b3d6cfeae 100644 --- a/test/mail/0202.userx +++ b/test/mail/0202.userx @@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: .: this is legal From: me@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . This line follows .. @@ -17,10 +17,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: me@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . This line follows .. @@ -30,11 +30,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: me@test.ex ..: this really is legal +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 .. two dots . @@ -45,11 +45,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: me@test.ex ..: this really is legal +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 .. two dots . diff --git a/test/mail/0205.redirected b/test/mail/0205.redirected index 6b9a415ed..889ceb26d 100644 --- a/test/mail/0205.redirected +++ b/test/mail/0205.redirected @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Address-Data: >-redirect< diff --git a/test/mail/0205.x b/test/mail/0205.x index 622cba77f..cabaaf1cb 100644 --- a/test/mail/0205.x +++ b/test/mail/0205.x @@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Address-Data: >< diff --git a/test/mail/0210.file b/test/mail/0210.file index efe155e6b..feb122504 100644 --- a/test/mail/0210.file +++ b/test/mail/0210.file @@ -7,9 +7,9 @@ Envelope-to: file@test.ex Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/mail/0210.pipe b/test/mail/0210.pipe index bcb247317..4d976d64d 100644 --- a/test/mail/0210.pipe +++ b/test/mail/0210.pipe @@ -6,9 +6,9 @@ Envelope-to: pipe@test.ex Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER index 29a0e32b1..cd5f25b1a 100644 --- a/test/mail/0211.CALLER +++ b/test/mail/0211.CALLER @@ -3,13 +3,13 @@ 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@domain1 Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 @@ -38,14 +38,14 @@ 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: usery@domain2, userx@domain1 Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -65,9 +65,9 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 2 diff --git a/test/mail/0220.userx b/test/mail/0220.userx index 02060801b..0eadbaa41 100644 --- a/test/mail/0220.userx +++ b/test/mail/0220.userx @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From foo@bar Tue Mar 02 09:44:33 1999 @@ -14,10 +14,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From foo@bar Tue Mar 02 09:44:33 1999 @@ -25,10 +25,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From foo@bar Tue Mar 02 09:44:33 1999 @@ -36,10 +36,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: foobydooby +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -47,8 +47,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0221.userx b/test/mail/0221.userx index eed7e8ead..b13a7d7a0 100644 --- a/test/mail/0221.userx +++ b/test/mail/0221.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -13,9 +13,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: foobydooby +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1 index 0342bd97c..6db0b20c3 100644 --- a/test/mail/0222.foo1 +++ b/test/mail/0222.foo1 @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: foo1@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Auto reply message @@ -16,13 +16,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbH-0005vi-00 for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: foo1@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Auto reply message diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2 index e48467d98..a932aa023 100644 --- a/test/mail/0222.foo2 +++ b/test/mail/0222.foo2 @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbB-0005vi-00 for foo2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: foo2@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Auto reply message diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3 index 99e58473f..574730524 100644 --- a/test/mail/0222.foo3 +++ b/test/mail/0222.foo3 @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for foo3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: foo3@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Auto reply message diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER index 5b42d0548..45eac6bfe 100644 --- a/test/mail/0223.CALLER +++ b/test/mail/0223.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to first message @@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmbB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test auto reply to third message diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER index 2b3a998fa..b2c29d123 100644 --- a/test/mail/0226.CALLER +++ b/test/mail/0226.CALLER @@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: |/p/q/r@no.test.ex, /a/b/c@no.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -27,9 +27,9 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 @@ -37,13 +37,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@yes.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -88,9 +88,9 @@ USER=|TESTSUITE/aux-fixed/showenv Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 @@ -102,9 +102,9 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 diff --git a/test/mail/0226.file b/test/mail/0226.file index 79986490f..27c3caf48 100644 --- a/test/mail/0226.file +++ b/test/mail/0226.file @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 diff --git a/test/mail/0231.a b/test/mail/0231.a index aef741701..e83069fae 100644 --- a/test/mail/0231.a +++ b/test/mail/0231.a @@ -2,11 +2,11 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3 To: a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3 Reply-to: a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3 +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0231.b b/test/mail/0231.b index 02e9daa6e..ef29f5fea 100644 --- a/test/mail/0231.b +++ b/test/mail/0231.b @@ -2,11 +2,11 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3 To: a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3 Reply-to: a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3 +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0233.me b/test/mail/0233.me index edd32e886..1e9b1086c 100644 --- a/test/mail/0233.me +++ b/test/mail/0233.me @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaZ-0005vi-00 for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: me@myhost.test.ex Subject: Message frozen +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 10HmaX-0005vi-00 has been frozen by the system filter. system filter freezes. @@ -20,12 +20,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: me@myhost.test.ex Subject: Message frozen on arrival +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 10HmbB-0005vi-00 was frozen on arrival by ACL. The sender is . @@ -34,12 +34,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: me@myhost.test.ex Subject: Message frozen on arrival +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 10HmbD-0005vi-00 was frozen on arrival by ACL. The sender is . diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster index 84146dc36..6c0b1ff4e 100644 --- a/test/mail/0233.postmaster +++ b/test/mail/0233.postmaster @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for postmaster@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: postmaster@myhost.test.ex Subject: System filter has frozen In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER index 43cd1150b..700c73d7b 100644 --- a/test/mail/0237.CALLER +++ b/test/mail/0237.CALLER @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,9 +25,9 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 @@ -35,12 +35,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -85,9 +85,9 @@ USER=|TESTSUITE/aux-fixed/showenv Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 @@ -99,9 +99,9 @@ Return-path: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 diff --git a/test/mail/0237.file b/test/mail/0237.file index 79986490f..27c3caf48 100644 --- a/test/mail/0237.file +++ b/test/mail/0237.file @@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 diff --git a/test/mail/0240.subdir/userx b/test/mail/0240.subdir/userx index 697244059..e3b863543 100644 --- a/test/mail/0240.subdir/userx +++ b/test/mail/0240.subdir/userx @@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0241.userx b/test/mail/0241.userx index 697244059..e3b863543 100644 --- a/test/mail/0241.userx +++ b/test/mail/0241.userx @@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0243.CALLER b/test/mail/0243.CALLER index 1131d9c33..11fc70884 100644 --- a/test/mail/0243.CALLER +++ b/test/mail/0243.CALLER @@ -2,8 +2,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@nl.demon.net; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: local.part@some.domain Reply-To: x@y, p@q @@ -12,6 +10,8 @@ Subject: Re: In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text of auto message. Expanded local_part is: faq. diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER index 2de9eaf2f..8f9e5141b 100644 --- a/test/mail/0246.CALLER +++ b/test/mail/0246.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER_NAME In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 >>>>>>>>>>>>>> ${if exists{/source/exim4/AutoTest/aux/284.data}{${lookup{1}lsearch{/source/exim4/AutoTest/aux/284.data}{$value}{NOT FOUND}}}{NOT EXISTS}} diff --git a/test/mail/0252.t1 b/test/mail/0252.t1 index e778583c4..c81584d8b 100644 --- a/test/mail/0252.t1 +++ b/test/mail/0252.t1 @@ -4,9 +4,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: abc@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for alias@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: pqr@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for forward@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: gfh@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for smart@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: mno@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0252.t2 b/test/mail/0252.t2 index 519380d2a..557cf2780 100644 --- a/test/mail/0252.t2 +++ b/test/mail/0252.t2 @@ -4,9 +4,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: abc@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for alias@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: pqr@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for forward@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: gfh@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message @@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for smart@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: mno@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn index 9b6ee4e69..eeac8dc20 100644 --- a/test/mail/0253.lmn +++ b/test/mail/0253.lmn @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for lmn@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: fail@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: lmn@myhost.test.ex Subject: Mail delivery failed +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -29,9 +29,9 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: pqr@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 3 diff --git a/test/mail/0253.t1 b/test/mail/0253.t1 index 11d017e13..89e645ffb 100644 --- a/test/mail/0253.t1 +++ b/test/mail/0253.t1 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: abc@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . diff --git a/test/mail/0253.t2 b/test/mail/0253.t2 index b30c72c8d..7a64b8ccf 100644 --- a/test/mail/0253.t2 +++ b/test/mail/0253.t2 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: xyz@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 2 . diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER index 434e191e6..87ed8a038 100644 --- a/test/mail/0256.CALLER +++ b/test/mail/0256.CALLER @@ -1,13 +1,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: unknown@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def index 5ef0a58b1..22a2ecd35 100644 --- a/test/mail/0256.abc@def +++ b/test/mail/0256.abc@def @@ -1,13 +1,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: unknown@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: "abc@def"@unknown.domain Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <"abc@def"@unknown.domain>) id 10HmaZ-0005vi-00 for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: "abc@def"@unknown.domain +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0256.abcd+test.ex+xxxx b/test/mail/0256.abcd+test.ex+xxxx index 434e191e6..87ed8a038 100644 --- a/test/mail/0256.abcd+test.ex+xxxx +++ b/test/mail/0256.abcd+test.ex+xxxx @@ -1,13 +1,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: unknown@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git "a/test/mail/0256.abcd+unknown.domain+\"abc@def\"" "b/test/mail/0256.abcd+unknown.domain+\"abc@def\"" index 5ef0a58b1..22a2ecd35 100644 --- "a/test/mail/0256.abcd+unknown.domain+\"abc@def\"" +++ "b/test/mail/0256.abcd+unknown.domain+\"abc@def\"" @@ -1,13 +1,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: unknown@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: "abc@def"@unknown.domain Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <"abc@def"@unknown.domain>) id 10HmaZ-0005vi-00 for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: "abc@def"@unknown.domain +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0258.userx b/test/mail/0258.userx index 5abfe11b7..75ac31477 100644 --- a/test/mail/0258.userx +++ b/test/mail/0258.userx @@ -3,12 +3,12 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: crheader: includes < > and ends CRLF Subject: this is still a header +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text includes < > and ends CRLF @@ -23,11 +23,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: crheader: includes < > and ends CRLF +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text includes < > and ends CRLF @@ -43,11 +43,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: crheader: includes < > and ends CRLF +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Text includes < > and ends CRLF @@ -62,9 +62,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message with no terminating LF @@ -74,9 +74,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message with terminating CR @@ -85,9 +85,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message with no terminating LF @@ -97,9 +97,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message with terminating CR @@ -108,12 +108,12 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: .dotheader: header line starts with a dot xxx: dot bare CR:. xyz +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . weird header line @@ -124,11 +124,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: contains CR< > in the subject +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 CR.CR . @@ -140,11 +140,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: contains CR< > in the subject +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 CR.CR . diff --git a/test/mail/0260.userx b/test/mail/0260.userx index 68c6bc139..c620db5d7 100644 --- a/test/mail/0260.userx +++ b/test/mail/0260.userx @@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0266.CALLER b/test/mail/0266.CALLER index d09def199..9fd70e00a 100644 --- a/test/mail/0266.CALLER +++ b/test/mail/0266.CALLER @@ -4,13 +4,13 @@ Envelope-to: CALLER@test.ex Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbF-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: nmlist@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -26,9 +26,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for nmlist@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to nmlist. diff --git a/test/mail/0266.filter b/test/mail/0266.filter index 30dbcb4cc..137fab1f6 100644 --- a/test/mail/0266.filter +++ b/test/mail/0266.filter @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for filter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0266.filter2 b/test/mail/0266.filter2 index da3371030..443ca18c3 100644 --- a/test/mail/0266.filter2 +++ b/test/mail/0266.filter2 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for filter2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to filter2. diff --git a/test/mail/0266.filter3 b/test/mail/0266.filter3 index 14d861e66..62ddce124 100644 --- a/test/mail/0266.filter3 +++ b/test/mail/0266.filter3 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for filter3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to filter3. diff --git a/test/mail/0266.list2 b/test/mail/0266.list2 index 74d706287..7b7dd1431 100644 --- a/test/mail/0266.list2 +++ b/test/mail/0266.list2 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for list2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to list2. diff --git a/test/mail/0266.postmaster b/test/mail/0266.postmaster index bf47c0fed..7a17cf16e 100644 --- a/test/mail/0266.postmaster +++ b/test/mail/0266.postmaster @@ -4,12 +4,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 The r1 router encountered the following error(s): @@ -24,12 +24,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 The r1 router encountered the following error(s): @@ -44,12 +44,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 There's an error in your filter file. The file has been ignored. @@ -66,12 +66,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 The r1a router encountered the following error(s): @@ -86,12 +86,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbH-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 There's an error in your filter file. The file has been ignored. @@ -108,12 +108,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbJ-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 There's an error in your filter file. The file has been ignored. diff --git a/test/mail/0266.spqr b/test/mail/0266.spqr index 52a775366..6c1c436e7 100644 --- a/test/mail/0266.spqr +++ b/test/mail/0266.spqr @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0266.userx b/test/mail/0266.userx index 52a775366..6c1c436e7 100644 --- a/test/mail/0266.userx +++ b/test/mail/0266.userx @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0270.CALLER b/test/mail/0270.CALLER index d09def199..9fd70e00a 100644 --- a/test/mail/0270.CALLER +++ b/test/mail/0270.CALLER @@ -4,13 +4,13 @@ Envelope-to: CALLER@test.ex Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbF-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: nmlist@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -26,9 +26,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for nmlist@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to nmlist. diff --git a/test/mail/0270.filter b/test/mail/0270.filter index 30dbcb4cc..137fab1f6 100644 --- a/test/mail/0270.filter +++ b/test/mail/0270.filter @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for filter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0270.filter2 b/test/mail/0270.filter2 index da3371030..443ca18c3 100644 --- a/test/mail/0270.filter2 +++ b/test/mail/0270.filter2 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for filter2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to filter2. diff --git a/test/mail/0270.filter3 b/test/mail/0270.filter3 index 14d861e66..62ddce124 100644 --- a/test/mail/0270.filter3 +++ b/test/mail/0270.filter3 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for filter3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to filter3. diff --git a/test/mail/0270.list2 b/test/mail/0270.list2 index 74d706287..7b7dd1431 100644 --- a/test/mail/0270.list2 +++ b/test/mail/0270.list2 @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for list2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message to list2. diff --git a/test/mail/0270.postmaster b/test/mail/0270.postmaster index 949c2815b..3a6d43923 100644 --- a/test/mail/0270.postmaster +++ b/test/mail/0270.postmaster @@ -4,12 +4,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 The r1 router encountered the following error(s): @@ -24,12 +24,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 The r1 router encountered the following error(s): @@ -44,12 +44,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 There's an error in your filter file. The file has been ignored. @@ -66,12 +66,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 The r1a router encountered the following error(s): @@ -86,12 +86,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbH-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 There's an error in your filter file. The file has been ignored. @@ -108,12 +108,12 @@ Envelope-to: postmaster@test.ex Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbJ-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: error(s) in forwarding or filtering +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 There's an error in your filter file. The file has been ignored. diff --git a/test/mail/0270.spqr b/test/mail/0270.spqr index 52a775366..6c1c436e7 100644 --- a/test/mail/0270.spqr +++ b/test/mail/0270.spqr @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0270.userx b/test/mail/0270.userx index 52a775366..6c1c436e7 100644 --- a/test/mail/0270.userx +++ b/test/mail/0270.userx @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0274.abcd b/test/mail/0274.abcd index 68c6bc139..c620db5d7 100644 --- a/test/mail/0274.abcd +++ b/test/mail/0274.abcd @@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0274.redirect b/test/mail/0274.redirect index 68c6bc139..c620db5d7 100644 --- a/test/mail/0274.redirect +++ b/test/mail/0274.redirect @@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0274.userx b/test/mail/0274.userx index 68c6bc139..c620db5d7 100644 --- a/test/mail/0274.userx +++ b/test/mail/0274.userx @@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0274.xyz b/test/mail/0274.xyz index 68c6bc139..c620db5d7 100644 --- a/test/mail/0274.xyz +++ b/test/mail/0274.xyz @@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0280.CALLER b/test/mail/0280.CALLER index eb2858159..76002d971 100644 --- a/test/mail/0280.CALLER +++ b/test/mail/0280.CALLER @@ -1,13 +1,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: spqr@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: spqr@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,21 +24,21 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for spqr@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: spqr@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: abcd@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: abcd@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -55,8 +55,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: abcd@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0283.CALLER b/test/mail/0283.CALLER index 4ed2331cd..282f7c143 100644 --- a/test/mail/0283.CALLER +++ b/test/mail/0283.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaZ-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: somebody@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -30,9 +30,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for somebody@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 test diff --git a/test/mail/0284.batched b/test/mail/0284.batched index 249f65569..51d20fbb5 100644 --- a/test/mail/0284.batched +++ b/test/mail/0284.batched @@ -4,9 +4,9 @@ Envelope-to: x-t1@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -15,9 +15,9 @@ Envelope-to: x-t4@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -26,8 +26,8 @@ Envelope-to: y-t4@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0284.other.domain b/test/mail/0284.other.domain index 47818fe9b..0d5a67495 100644 --- a/test/mail/0284.other.domain +++ b/test/mail/0284.other.domain @@ -3,8 +3,8 @@ Envelope-to: z-t3@other.domain Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0284.test.ex b/test/mail/0284.test.ex index c537eea90..c0c5be90b 100644 --- a/test/mail/0284.test.ex +++ b/test/mail/0284.test.ex @@ -4,8 +4,8 @@ Envelope-to: x-t3@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0284.x-t2 b/test/mail/0284.x-t2 index 1f740be46..685deb48a 100644 --- a/test/mail/0284.x-t2 +++ b/test/mail/0284.x-t2 @@ -3,8 +3,8 @@ Envelope-to: x-t2@test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0284.y-t2 b/test/mail/0284.y-t2 index c0b14e8fb..a2c4531e5 100644 --- a/test/mail/0284.y-t2 +++ b/test/mail/0284.y-t2 @@ -3,8 +3,8 @@ Envelope-to: y-t2@test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0289.CALLER b/test/mail/0289.CALLER index b671a34df..67685017d 100644 --- a/test/mail/0289.CALLER +++ b/test/mail/0289.CALLER @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaX-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail failure - too many recipients +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent contained more recipients than allowed on this system. It was not delivered to any recipients. diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER index 861ec80fc..e97405211 100644 --- a/test/mail/0296.CALLER +++ b/test/mail/0296.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: failure@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for failure@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test junk data diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER index 9f0e99775..8cb3b6454 100644 --- a/test/mail/0298.CALLER +++ b/test/mail/0298.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: failure1@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -26,22 +26,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for failure1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: failure2@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -58,8 +58,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for failure2@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0306.anyone b/test/mail/0306.anyone index 5c5c574e7..2c8eb7251 100644 --- a/test/mail/0306.anyone +++ b/test/mail/0306.anyone @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: list1@lists.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: anyone@anywhere Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for list1@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: anyone@anywhere +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: nonlist@lists.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: anyone@anywhere Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for nonlist@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: anyone@anywhere +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone index 5c5c574e7..2c8eb7251 100644 --- a/test/mail/0307.anyone +++ b/test/mail/0307.anyone @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: list1@lists.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: anyone@anywhere Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for list1@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: anyone@anywhere +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: nonlist@lists.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: anyone@anywhere Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for nonlist@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: anyone@anywhere +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER index f5ae66a5f..59aae6e4e 100644 --- a/test/mail/0309.CALLER +++ b/test/mail/0309.CALLER @@ -2,8 +2,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: 1k@myhost.test.ex, 55@myhost.test.ex, 50@myhost.test.ex @@ -11,6 +9,8 @@ Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -27,9 +27,9 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. This is a test message. This is a test message. This is a test message. diff --git a/test/mail/0310.CALLER b/test/mail/0310.CALLER index b6167a06f..55748724a 100644 --- a/test/mail/0310.CALLER +++ b/test/mail/0310.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: abcd@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. diff --git a/test/mail/0318.userx b/test/mail/0318.userx index 21ba6107b..6f77ef9ee 100644 --- a/test/mail/0318.userx +++ b/test/mail/0318.userx @@ -2,8 +2,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the first message. diff --git a/test/mail/0319.saved b/test/mail/0319.saved index 7ebe98d3e..d23681e94 100644 --- a/test/mail/0319.saved +++ b/test/mail/0319.saved @@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: subject: file +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the first message. diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER index bf5032fce..5d836a512 100644 --- a/test/mail/0321.CALLER +++ b/test/mail/0321.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 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 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,9 +25,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for |/bin/cat\ /etc/aliases\ @test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 quit diff --git a/test/mail/0324.userx b/test/mail/0324.userx index 08c14924d..b83389d67 100644 --- a/test/mail/0324.userx +++ b/test/mail/0324.userx @@ -3,8 +3,6 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Long: This is a very long header continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -663,7 +661,9 @@ X-Long: This is a very long header continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa This is the final line which should get chopped. X-Long: This is another header with the same name. +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-match: NO Y-match: NO Z-match: NO diff --git a/test/mail/0326.userx b/test/mail/0326.userx index 5bb9ecbc2..2beaf0d6b 100644 --- a/test/mail/0326.userx +++ b/test/mail/0326.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for pppp-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 OLP: pppp-userx OLP: pppp-userx @@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx+ssss@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 OLP: userx+ssss OLP: userx+ssss @@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 OLP: userx diff --git a/test/mail/0327.userx b/test/mail/0327.userx index ef8f8ac14..78566bda4 100644 --- a/test/mail/0327.userx +++ b/test/mail/0327.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -13,8 +13,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0328.userx b/test/mail/0328.userx index 64849bbbf..c000ee10f 100644 --- a/test/mail/0328.userx +++ b/test/mail/0328.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 added: this header is added diff --git a/test/mail/0329.userx b/test/mail/0329.userx index 64849bbbf..c000ee10f 100644 --- a/test/mail/0329.userx +++ b/test/mail/0329.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 added: this header is added diff --git a/test/mail/0330.userz1 b/test/mail/0330.userz1 index 49b058381..0c6f01926 100644 --- a/test/mail/0330.userz1 +++ b/test/mail/0330.userz1 @@ -4,10 +4,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Remove: This header should go +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -16,10 +16,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for UserY@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Remove: This header should go +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -28,9 +28,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Remove: This header should go +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0335.batch b/test/mail/0335.batch index e2e8f7f6e..9af240869 100644 --- a/test/mail/0335.batch +++ b/test/mail/0335.batch @@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for batch@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0335.clone b/test/mail/0335.clone index cf4d861b8..9f5ca6e87 100644 --- a/test/mail/0335.clone +++ b/test/mail/0335.clone @@ -7,8 +7,8 @@ Envelope-to: clone@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0335.final b/test/mail/0335.final index bac018351..ce7ba659a 100644 --- a/test/mail/0335.final +++ b/test/mail/0335.final @@ -4,9 +4,9 @@ Envelope-to: onelevel2@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -15,9 +15,9 @@ Envelope-to: top2@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -28,8 +28,8 @@ Envelope-to: onelevel2@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0338.a1-userx b/test/mail/0338.a1-userx index 22dd5f6ad..8aaf5e497 100644 --- a/test/mail/0338.a1-userx +++ b/test/mail/0338.a1-userx @@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0338.a2-userx b/test/mail/0338.a2-userx index 22dd5f6ad..8aaf5e497 100644 --- a/test/mail/0338.a2-userx +++ b/test/mail/0338.a2-userx @@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0341.mailbox b/test/mail/0341.mailbox index 657b84c20..e02fff8bb 100644 --- a/test/mail/0341.mailbox +++ b/test/mail/0341.mailbox @@ -4,8 +4,8 @@ Envelope-to: userx@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0346.x b/test/mail/0346.x index 2d1d3daf8..af1c48018 100644 --- a/test/mail/0346.x +++ b/test/mail/0346.x @@ -4,8 +4,8 @@ Envelope-to: x@dom1, Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0349.xxxx b/test/mail/0349.xxxx index 34283efd4..8d9e1de01 100644 --- a/test/mail/0349.xxxx +++ b/test/mail/0349.xxxx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing, testing diff --git a/test/mail/0352.userx b/test/mail/0352.userx index be18e8077..4b16d1949 100644 --- a/test/mail/0352.userx +++ b/test/mail/0352.userx @@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: To: +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: abcd no Found: xyz no TO: >< @@ -19,13 +19,13 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: abcd@test.ex To: To: xyz@test.ex To: pqr@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: abcd yes Found: xyz yes TO: >abcd@test.ex, @@ -39,13 +39,13 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: To: abcd@test.ex To: xyz@test.ex To: pqr@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: abcd yes Found: xyz yes TO: >abcd@test.ex, @@ -59,13 +59,13 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: abcd@test.ex To: xyz@test.ex To: pqr@test.ex To: +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: abcd yes Found: xyz yes TO: >abcd@test.ex, diff --git a/test/mail/0359.userx b/test/mail/0359.userx index 72147a6e9..67eae78d3 100644 --- a/test/mail/0359.userx +++ b/test/mail/0359.userx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-shadowed: diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER index 1b7454e1a..36e4ef014 100644 --- a/test/mail/0374.CALLER +++ b/test/mail/0374.CALLER @@ -4,14 +4,14 @@ Envelope-to: CALLER@myhost.test.ex Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: d3@myhost.test.ex, b1@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -30,8 +30,8 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.a1 b/test/mail/0374.a1 index 0cfab456e..7f05c69fc 100644 --- a/test/mail/0374.a1 +++ b/test/mail/0374.a1 @@ -4,8 +4,8 @@ Envelope-to: a1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.a1-u b/test/mail/0374.a1-u index 0cfab456e..7f05c69fc 100644 --- a/test/mail/0374.a1-u +++ b/test/mail/0374.a1-u @@ -4,8 +4,8 @@ Envelope-to: a1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.b1 b/test/mail/0374.b1 index 55805eee0..0828f8915 100644 --- a/test/mail/0374.b1 +++ b/test/mail/0374.b1 @@ -4,8 +4,8 @@ Envelope-to: b1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.c1 b/test/mail/0374.c1 index 7d9557c42..34b259b57 100644 --- a/test/mail/0374.c1 +++ b/test/mail/0374.c1 @@ -4,8 +4,8 @@ Envelope-to: c1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.d1 b/test/mail/0374.d1 index 450c5a126..f8f550a4b 100644 --- a/test/mail/0374.d1 +++ b/test/mail/0374.d1 @@ -4,8 +4,8 @@ Envelope-to: d1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.d2 b/test/mail/0374.d2 index 378730100..10a2fd8ae 100644 --- a/test/mail/0374.d2 +++ b/test/mail/0374.d2 @@ -4,8 +4,8 @@ Envelope-to: d2@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0374.d3 b/test/mail/0374.d3 index d52db4b68..bf4454b6a 100644 --- a/test/mail/0374.d3 +++ b/test/mail/0374.d3 @@ -4,8 +4,8 @@ Envelope-to: d3@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER index 70ac5ad1a..9fc9424a9 100644 --- a/test/mail/0375.CALLER +++ b/test/mail/0375.CALLER @@ -4,13 +4,13 @@ Envelope-to: CALLER@myhost.test.ex Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: e1@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -27,8 +27,8 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.a1 b/test/mail/0375.a1 index 0cfab456e..7f05c69fc 100644 --- a/test/mail/0375.a1 +++ b/test/mail/0375.a1 @@ -4,8 +4,8 @@ Envelope-to: a1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.a1-u b/test/mail/0375.a1-u index 686b60ab5..031e92c38 100644 --- a/test/mail/0375.a1-u +++ b/test/mail/0375.a1-u @@ -4,8 +4,8 @@ Envelope-to: a1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.b1 b/test/mail/0375.b1 index 55805eee0..0828f8915 100644 --- a/test/mail/0375.b1 +++ b/test/mail/0375.b1 @@ -4,8 +4,8 @@ Envelope-to: b1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.c1 b/test/mail/0375.c1 index 7d9557c42..34b259b57 100644 --- a/test/mail/0375.c1 +++ b/test/mail/0375.c1 @@ -4,8 +4,8 @@ Envelope-to: c1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.d1 b/test/mail/0375.d1 index 450c5a126..f8f550a4b 100644 --- a/test/mail/0375.d1 +++ b/test/mail/0375.d1 @@ -4,8 +4,8 @@ Envelope-to: d1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.d2 b/test/mail/0375.d2 index 378730100..10a2fd8ae 100644 --- a/test/mail/0375.d2 +++ b/test/mail/0375.d2 @@ -4,8 +4,8 @@ Envelope-to: d2@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.d3 b/test/mail/0375.d3 index d52db4b68..bf4454b6a 100644 --- a/test/mail/0375.d3 +++ b/test/mail/0375.d3 @@ -4,8 +4,8 @@ Envelope-to: d3@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.e1 b/test/mail/0375.e1 index a7499ebc7..207f5a3af 100644 --- a/test/mail/0375.e1 +++ b/test/mail/0375.e1 @@ -4,8 +4,8 @@ Envelope-to: e1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.f1 b/test/mail/0375.f1 index e478848da..91e6b3156 100644 --- a/test/mail/0375.f1 +++ b/test/mail/0375.f1 @@ -4,8 +4,8 @@ Envelope-to: f1@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.f2 b/test/mail/0375.f2 index 93dc521d2..c0f59bf1c 100644 --- a/test/mail/0375.f2 +++ b/test/mail/0375.f2 @@ -4,8 +4,8 @@ Envelope-to: f2@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.f3 b/test/mail/0375.f3 index b7a828a74..96c0c3ebb 100644 --- a/test/mail/0375.f3 +++ b/test/mail/0375.f3 @@ -4,8 +4,8 @@ Envelope-to: f3@myhost.test.ex Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.h1 b/test/mail/0375.h1 index ed9d17331..7e0faaeac 100644 --- a/test/mail/0375.h1 +++ b/test/mail/0375.h1 @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for h1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0375.h1-u b/test/mail/0375.h1-u index ed9d17331..7e0faaeac 100644 --- a/test/mail/0375.h1-u +++ b/test/mail/0375.h1-u @@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for h1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0377.aaaa b/test/mail/0377.aaaa index 8bdec08a5..872481d91 100644 --- a/test/mail/0377.aaaa +++ b/test/mail/0377.aaaa @@ -2,8 +2,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0377.bbbb b/test/mail/0377.bbbb index 8bdec08a5..872481d91 100644 --- a/test/mail/0377.bbbb +++ b/test/mail/0377.bbbb @@ -2,8 +2,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0377.cccc b/test/mail/0377.cccc index 8bdec08a5..872481d91 100644 --- a/test/mail/0377.cccc +++ b/test/mail/0377.cccc @@ -2,8 +2,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0378.file b/test/mail/0378.file index 37cef8763..71b909d6d 100644 --- a/test/mail/0378.file +++ b/test/mail/0378.file @@ -3,8 +3,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0379.bbbb b/test/mail/0379.bbbb index 8bdec08a5..872481d91 100644 --- a/test/mail/0379.bbbb +++ b/test/mail/0379.bbbb @@ -2,8 +2,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0379.cccc b/test/mail/0379.cccc index 8bdec08a5..872481d91 100644 --- a/test/mail/0379.cccc +++ b/test/mail/0379.cccc @@ -2,8 +2,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0380.bbbb b/test/mail/0380.bbbb index 8bdec08a5..872481d91 100644 --- a/test/mail/0380.bbbb +++ b/test/mail/0380.bbbb @@ -2,8 +2,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER index f151d9e46..e54e474fa 100644 --- a/test/mail/0383.CALLER +++ b/test/mail/0383.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: system-filter Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -56,10 +56,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: alice@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -71,23 +71,23 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: alice@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: system-filter Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -134,10 +134,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: jabberwocky@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -149,23 +149,23 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: jabberwocky@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: redking@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -213,10 +213,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: redking@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 ------------------ @@ -228,9 +228,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: redking@test.ex +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER index f79ca70af..cd43c268b 100644 --- a/test/mail/0385.CALLER +++ b/test/mail/0385.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,10 +25,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: body size = 2 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X @@ -36,13 +36,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -59,10 +59,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: body size = 200 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -73,13 +73,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -96,10 +96,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: body size = 1600 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -138,13 +138,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -163,9 +163,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/test/mail/0393.userx b/test/mail/0393.userx index 3358d1ee9..ab724c4ef 100644 --- a/test/mail/0393.userx +++ b/test/mail/0393.userx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing with filter diff --git a/test/mail/0395.CALLER b/test/mail/0395.CALLER index d7285f91e..55c623f70 100644 --- a/test/mail/0395.CALLER +++ b/test/mail/0395.CALLER @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail failure - malformed recipient address +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent contained a recipient address that was incorrectly constructed: diff --git a/test/mail/0395.userx b/test/mail/0395.userx index a8f10e53e..5c7e799bf 100644 --- a/test/mail/0395.userx +++ b/test/mail/0395.userx @@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: philip To: userx +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -15,11 +15,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx@origin.ex To: userx@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -27,11 +27,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx@test.ex To: userx@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -39,10 +39,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: philip To: userx +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -50,11 +50,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx To: userx +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -62,11 +62,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx@test.ex To: userx@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -74,11 +74,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx To: userx +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -86,10 +86,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx@test.ex To: userx@test.ex +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0398.x b/test/mail/0398.x index 9c05c7c18..85dde19fd 100644 --- a/test/mail/0398.x +++ b/test/mail/0398.x @@ -3,9 +3,9 @@ Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x@local; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing diff --git a/test/mail/0404.sender b/test/mail/0404.sender index d75996222..fd77af8fe 100644 --- a/test/mail/0404.sender +++ b/test/mail/0404.sender @@ -1,13 +1,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 rhubarb diff --git a/test/mail/0408.userx b/test/mail/0408.userx index 99f22673e..159be9823 100644 --- a/test/mail/0408.userx +++ b/test/mail/0408.userx @@ -3,8 +3,8 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0411.afolder b/test/mail/0411.afolder index 18cb667c4..96b94a189 100644 --- a/test/mail/0411.afolder +++ b/test/mail/0411.afolder @@ -3,17 +3,17 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for t1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0412.CALLER b/test/mail/0412.CALLER index 89b8a60fe..260252beb 100644 --- a/test/mail/0412.CALLER +++ b/test/mail/0412.CALLER @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: CALLER_NAME +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no FROM: CALLER_NAME @@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Reply-to: From: CALLER_NAME +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no FROM: CALLER_NAME @@ -38,10 +38,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Reply-to: usery@test.ex From: CALLER_NAME +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no FROM: CALLER_NAME @@ -56,10 +56,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no FROM: diff --git a/test/mail/0421.a b/test/mail/0421.a index 6fb4b78c5..e8cc113a5 100644 --- a/test/mail/0421.a +++ b/test/mail/0421.a @@ -3,12 +3,12 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for a@b.c; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: abc@x.y.z To: abc@x.y.z Reply-to: abc@x.y.z +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Reply-to: abc@x.y.z diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER index e6cdf9e35..2cea2cb9b 100644 --- a/test/mail/0428.CALLER +++ b/test/mail/0428.CALLER @@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: restrict-userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -28,10 +28,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Filter: require "fileinto"; fileinto "userx-extra"; +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 5 @@ -42,13 +42,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: restrict-userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -65,10 +65,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Filter: fileinto "userx-extra"; +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 6 diff --git a/test/mail/0428.inbox.JUNK b/test/mail/0428.inbox.JUNK index 6d83deb36..088f808c7 100644 --- a/test/mail/0428.inbox.JUNK +++ b/test/mail/0428.inbox.JUNK @@ -6,15 +6,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Sieve: 99 Filter: require["fileinto","comparator-i;ascii-numeric"]; if header :comparator "i;ascii-numeric" "X-Sieve" "99" { fileinto "inbox.JUNK"; stop; } +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 8 @@ -26,15 +26,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Sieve: 99- Filter: require["fileinto","comparator-i;ascii-numeric"]; if header :comparator "i;ascii-numeric" "X-Sieve" "99" { fileinto "inbox.JUNK"; stop; } +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 10 @@ -46,15 +46,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbJ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Sieve: -99 Filter: require["fileinto","comparator-i;ascii-numeric"]; if header :comparator "i;ascii-numeric" "X-Sieve" "-99" { fileinto "inbox.JUNK"; stop; } +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 11 @@ -66,15 +66,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbK-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Sieve: -99 Filter: require["fileinto","comparator-i;ascii-numeric"]; if header :comparator "i;ascii-numeric" "X-Sieve" "-98" { fileinto "inbox.JUNK"; stop; } +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 12 diff --git a/test/mail/0428.redirected b/test/mail/0428.redirected index b436d75f4..fc048367b 100644 --- a/test/mail/0428.redirected +++ b/test/mail/0428.redirected @@ -6,10 +6,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Filter: redirect "redirected@test.ex"; +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 4 diff --git a/test/mail/0428.someone b/test/mail/0428.someone index 65e5628d9..a3ba52b88 100644 --- a/test/mail/0428.someone +++ b/test/mail/0428.someone @@ -5,8 +5,6 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmbM-0005vi-00 for someone@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: userx@test.ex To: someone@test.ex Subject: Automated reply @@ -17,6 +15,8 @@ MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 I am gone. Not here. diff --git a/test/mail/0428.userx b/test/mail/0428.userx index 3e9cbd4f5..8c3402bd7 100644 --- a/test/mail/0428.userx +++ b/test/mail/0428.userx @@ -6,9 +6,9 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 1 @@ -20,10 +20,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Filter: if true { stop; fileinto "inbox.never"; } +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 7 @@ -35,15 +35,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Sieve: 99 Filter: require["fileinto","comparator-i;ascii-numeric"]; if header :comparator "i;ascii-numeric" "X-Sieve" "98" { fileinto "inbox.JUNK"; stop; } +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 9 @@ -55,12 +55,12 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbL-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex Filter: require ["vacation"]; vacation "I am gone. Not here."; +Message-Id: From: someone@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 13 @@ -71,15 +71,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx-suffix@test.ex Filter: require ["envelope","fileinto"]; if envelope :matches :localpart "to" "*-suffix" { fileinto "userx-sawsuffix"; stop; } +Message-Id: From: someone@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 14 diff --git a/test/mail/0428.userx-extra b/test/mail/0428.userx-extra index 6e10c9d4e..d7dc5ae1b 100644 --- a/test/mail/0428.userx-extra +++ b/test/mail/0428.userx-extra @@ -6,10 +6,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Filter: require "fileinto"; fileinto "userx-extra"; +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 3 diff --git a/test/mail/0428.userx-sawsuffix b/test/mail/0428.userx-sawsuffix index 6bb060832..ef2e8b5e3 100644 --- a/test/mail/0428.userx-sawsuffix +++ b/test/mail/0428.userx-sawsuffix @@ -5,15 +5,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx-suffix@test.ex Filter: require ["envelope","fileinto"]; if envelope :matches :localpart "to" "*-suffix" { fileinto "userx-sawsuffix"; stop; } +Message-Id: From: someone@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 14 diff --git a/test/mail/0431.xxx b/test/mail/0431.xxx index 30f2ea471..263f826fe 100644 --- a/test/mail/0431.xxx +++ b/test/mail/0431.xxx @@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for pre.xxx@a.b; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . MAIL FROM: @@ -17,8 +17,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for pre.xxx@a.b; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . diff --git a/test/mail/0436.CALLER b/test/mail/0436.CALLER index c531a4da1..71eedd979 100644 --- a/test/mail/0436.CALLER +++ b/test/mail/0436.CALLER @@ -11,8 +11,8 @@ Envelope-to: a@d1.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . diff --git a/test/mail/0437.file b/test/mail/0437.file index eb79fa789..4c0dd6c82 100644 --- a/test/mail/0437.file +++ b/test/mail/0437.file @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 First message @@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second message diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER index 1e9c21103..76b76de6b 100644 --- a/test/mail/0444.CALLER +++ b/test/mail/0444.CALLER @@ -2,8 +2,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: Mailer-Daemon@test.ex Reply-To: postmaster@test.ex To: CALLER@test.ex @@ -11,7 +9,9 @@ Subject: Submission of mail from CALLER@test.ex directly to the XXX hosts In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 You sent the message below from the host @@ -36,9 +36,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. diff --git a/test/mail/0444.userx b/test/mail/0444.userx index 12690ffb3..687b228a8 100644 --- a/test/mail/0444.userx +++ b/test/mail/0444.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. diff --git a/test/mail/0446.userx b/test/mail/0446.userx index 69ee5075c..4aebdbe23 100644 --- a/test/mail/0446.userx +++ b/test/mail/0446.userx @@ -3,11 +3,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Received: the first received: line Received: the second received: line +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-ACL: 3 X-Router: 3 @@ -17,11 +17,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Received: the first received: line Received: the second received: line +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-ACL: 3 X-Router: 3 diff --git a/test/mail/0449.userx b/test/mail/0449.userx index 33fb1ad13..7976e948a 100644 --- a/test/mail/0449.userx +++ b/test/mail/0449.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER index 6c9f41736..298abf033 100644 --- a/test/mail/0452.CALLER +++ b/test/mail/0452.CALLER @@ -2,8 +2,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@test.ex Subject: Auto generated In-Reply-To: @@ -13,7 +11,9 @@ h1: the first added header h2: the second added header continued on another line h3: the third added header +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is some body text @@ -21,13 +21,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -44,10 +44,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: fno: 2 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Another message diff --git a/test/mail/0452.userx b/test/mail/0452.userx index 842ec54e7..385e9ec18 100644 --- a/test/mail/0452.userx +++ b/test/mail/0452.userx @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: fno: 1 +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message. diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER index 7ac07a53f..7faa6251a 100644 --- a/test/mail/0461.CALLER +++ b/test/mail/0461.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message @@ -35,13 +35,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbD-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -58,9 +58,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message @@ -68,13 +68,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbF-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -91,9 +91,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message diff --git a/test/mail/0472.userz99 b/test/mail/0472.userz99 index 193b36f9e..ca8fa0d8a 100644 --- a/test/mail/0472.userz99 +++ b/test/mail/0472.userz99 @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing @@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing 2 diff --git a/test/mail/0481.userx b/test/mail/0481.userx index 990f05927..a9f142c35 100644 --- a/test/mail/0481.userx +++ b/test/mail/0481.userx @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Another: This is another header +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Was-Remove-Me: >this header is to be removed< diff --git a/test/mail/0487.userx b/test/mail/0487.userx index b7510c691..42d5c111a 100644 --- a/test/mail/0487.userx +++ b/test/mail/0487.userx @@ -4,9 +4,9 @@ Received: from CALLER (helo=x.y) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: unqualified +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message. diff --git a/test/mail/0491.userx b/test/mail/0491.userx index 404b65bac..d03d18632 100644 --- a/test/mail/0491.userx +++ b/test/mail/0491.userx @@ -3,9 +3,9 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz) (envelope-from <"abc@xyz"@myhost.test.ex>) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME <"abc@xyz"@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 From a.b@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -13,9 +13,9 @@ Received: from a.b by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From ".a.b"@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -23,9 +23,9 @@ Received: from ".a.b" by myhost.test.ex with local (Exim x.yz) (envelope-from <".a.b"@myhost.test.ex>) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME <".a.b"@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 From "a.b."@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -33,9 +33,9 @@ Received: from "a.b." by myhost.test.ex with local (Exim x.yz) (envelope-from <"a.b."@myhost.test.ex>) id 10HmbA-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME <"a.b."@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 From "a\"b"@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -43,9 +43,9 @@ Received: from "a\"b" by myhost.test.ex with local (Exim x.yz) (envelope-from <"a\"b"@myhost.test.ex>) id 10HmbB-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME <"a\"b"@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 From "abc@xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -53,10 +53,10 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz) (envelope-from <"abc@xyz"@myhost.test.ex>) id 10HmbC-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: x@y +Message-Id: Sender: CALLER_NAME <"abc@xyz"@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 From "abc%xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999 @@ -64,8 +64,8 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz) (envelope-from <"abc%xyz"@myhost.test.ex>) id 10HmbD-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME <"abc%xyz"@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0493.a b/test/mail/0493.a index a0d08aec7..ad9fceaea 100644 --- a/test/mail/0493.a +++ b/test/mail/0493.a @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 To: 12345@some.domain.or.other, 54321@some.domain.or.other, 12345@some.domain.or.other, 54321@some.domain.or.other, 12345@some.domain.or.other, 54321@some.domain.or.other, diff --git a/test/mail/0494.userx b/test/mail/0494.userx index 5b6a1e0d8..4379cb298 100644 --- a/test/mail/0494.userx +++ b/test/mail/0494.userx @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: userx@test.ex Subject: testing, testing In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: EXIMUSER@myhost.test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0496.someone b/test/mail/0496.someone index 69e717a67..49cda3694 100644 --- a/test/mail/0496.someone +++ b/test/mail/0496.someone @@ -5,11 +5,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaX-0005vi-00 for someone@el.se; Tue, 2 Mar 1999 09:44:33 +0000 After-Received: some text -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: some@ne To: someone@el.se +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-ACL-Warn: data1 data1 X-ACL-Warn: data2 data2 At-End: some text diff --git a/test/mail/0500.userx b/test/mail/0500.userx index a6ea3a711..78312f0d1 100644 --- a/test/mail/0500.userx +++ b/test/mail/0500.userx @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@y; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: testing +Message-Id: From: postmaster@y +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning (userx@y) diff --git a/test/mail/0503.userx b/test/mail/0503.userx index 533eb1660..afa0a578b 100644 --- a/test/mail/0503.userx +++ b/test/mail/0503.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test 1 diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster index ff04b8ef0..d2ead9f04 100644 --- a/test/mail/0508.postmaster +++ b/test/mail/0508.postmaster @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: Mail delivery failed +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -35,8 +35,8 @@ Return-path: <> Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message diff --git a/test/mail/0514.userx b/test/mail/0514.userx index bb31ef3af..5f22df611 100644 --- a/test/mail/0514.userx +++ b/test/mail/0514.userx @@ -3,9 +3,9 @@ Received: from "spaced user" by myhost.test.ex with local (Exim x.yz) (envelope-from <"spaced user"@myhost.test.ex>) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME <"spaced user"@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing diff --git a/test/mail/0517.userx b/test/mail/0517.userx index 6783f7d04..b9b1a1bc3 100644 --- a/test/mail/0517.userx +++ b/test/mail/0517.userx @@ -3,8 +3,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0522.CALLER b/test/mail/0522.CALLER index 01ff80221..09386c456 100644 --- a/test/mail/0522.CALLER +++ b/test/mail/0522.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: nofilter@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for nofilter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: filter@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for filter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0523.userx b/test/mail/0523.userx index 8da8da320..854cab5c0 100644 --- a/test/mail/0523.userx +++ b/test/mail/0523.userx @@ -6,9 +6,9 @@ Envelope-to: four@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Delivered-To: one@test.ex Delivered-To: userx@test.ex diff --git a/test/mail/0530.CALLER b/test/mail/0530.CALLER index 278f3ab2f..d07382180 100644 --- a/test/mail/0530.CALLER +++ b/test/mail/0530.CALLER @@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: Message-id, no References, no In-Reply-to In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -17,14 +17,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: Message-id, no References, In-Reply-to In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -32,14 +32,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: Message-id, References (1), In-Reply-to In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -47,14 +47,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbE-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: Message-id, References (5), no In-Reply-to In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -62,14 +62,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbG-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: Message-id, References (15), In-Reply-to In-Reply-To: References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -77,12 +77,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbI-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: no Message-id, no References, no In-Reply-to Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -90,13 +90,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbK-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: no Message-id, no References, In-Reply-to References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -104,13 +104,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbM-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: no Message-id, References (1), In-Reply-to References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -118,13 +118,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbO-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: no Message-id, References (5), no In-Reply-to References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. @@ -132,13 +132,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) id 10HmbQ-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: CALLER@myhost.test.ex Subject: Re: no Message-id, References (15), In-Reply-to References: Auto-Submitted: auto-replied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is the text of the autoreply. diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER index 98e03c6c6..a35a78259 100644 --- a/test/mail/0531.CALLER +++ b/test/mail/0531.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -24,9 +24,9 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -34,13 +34,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@retry.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -57,9 +57,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -67,13 +67,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: userx@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -91,9 +91,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok index 4685a414f..e669ef777 100644 --- a/test/mail/0532.rcptok +++ b/test/mail/0532.rcptok @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: cond: accept +Message-Id: From: mailok@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 MAIL: one MAIL: two MAIL: three @@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 NOTSMTP: rcptok@test.ex Test non-SMTP message. diff --git a/test/mail/0533.mbox b/test/mail/0533.mbox index 7b561cbfd..26716f507 100644 --- a/test/mail/0533.mbox +++ b/test/mail/0533.mbox @@ -4,9 +4,9 @@ Envelope-to: file-usery=mbox@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A test message. diff --git a/test/mail/0533.mbox2 b/test/mail/0533.mbox2 index f7ae33bfe..4d2c7548b 100644 --- a/test/mail/0533.mbox2 +++ b/test/mail/0533.mbox2 @@ -4,9 +4,9 @@ Envelope-to: file-usera=mbox2@test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A test message. diff --git a/test/mail/0535.userx b/test/mail/0535.userx index 62f708f03..e3994508e 100644 --- a/test/mail/0535.userx +++ b/test/mail/0535.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 No headers supplied. @@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: x@y +Date: Tue, 2 Mar 1999 09:44:33 +0000 No headers supplied. diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender index e92c7c606..9a3e0ea34 100644 --- a/test/mail/0536.oksender +++ b/test/mail/0536.oksender @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for oksender@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: user22@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: oksender@test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,8 +25,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for user22@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: oksender@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0536.user1 b/test/mail/0536.user1 index f8f09825b..b918842f9 100644 --- a/test/mail/0536.user1 +++ b/test/mail/0536.user1 @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaZ-0005vi-00 for user1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: user1@test.ex Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -20,8 +20,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: user1@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0536.user2 b/test/mail/0536.user2 index 8ff7b6f3a..64bd15814 100644 --- a/test/mail/0536.user2 +++ b/test/mail/0536.user2 @@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for user2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: user2@test.ex Subject: Mail failure - rejected by local scanning code +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message that you sent was rejected by the local scanning code that checks incoming messages on this system. The following error was given: @@ -20,8 +20,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: user2@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/0551.userx b/test/mail/0551.userx index 7e448b25b..01ca394c0 100644 --- a/test/mail/0551.userx +++ b/test/mail/0551.userx @@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 @@ -12,9 +12,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 @@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 3 diff --git a/test/mail/0551.usery b/test/mail/0551.usery index 7f822888a..e4d855b81 100644 --- a/test/mail/0551.usery +++ b/test/mail/0551.usery @@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 diff --git a/test/mail/0551.userz b/test/mail/0551.userz index 760f2665b..29b2f0da7 100644 --- a/test/mail/0551.userz +++ b/test/mail/0551.userz @@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 diff --git a/test/mail/2600.userx b/test/mail/2600.userx index e81b64d21..3e636bdb3 100644 --- a/test/mail/2600.userx +++ b/test/mail/2600.userx @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/3403.userx b/test/mail/3403.userx index 11e00c316..d8a0676d6 100644 --- a/test/mail/3403.userx +++ b/test/mail/3403.userx @@ -4,9 +4,9 @@ Received: from CALLER (helo=testing.ex) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aid: userx Test data diff --git a/test/mail/5000.new/1.myhost.test.ex b/test/mail/5000.new/1.myhost.test.ex index 8248ae7d1..517121389 100644 --- a/test/mail/5000.new/1.myhost.test.ex +++ b/test/mail/5000.new/1.myhost.test.ex @@ -2,9 +2,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_ +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message diff --git a/test/mail/5000.new/2.myhost.test.ex b/test/mail/5000.new/2.myhost.test.ex index 9ca1547b9..1b5b06498 100644 --- a/test/mail/5000.new/2.myhost.test.ex +++ b/test/mail/5000.new/2.myhost.test.ex @@ -2,10 +2,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_ +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/test/mail/5000.new/3.myhost.test.ex:S370 b/test/mail/5000.new/3.myhost.test.ex:S370 index 4512907d1..7ea68ff5a 100644 --- a/test/mail/5000.new/3.myhost.test.ex:S370 +++ b/test/mail/5000.new/3.myhost.test.ex:S370 @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_tagged_ tag:Ssss +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message diff --git a/test/mail/5000.new/4.myhost.test.ex,S=370 b/test/mail/5000.new/4.myhost.test.ex,S=370 index d84c6e62e..ed3879152 100644 --- a/test/mail/5000.new/4.myhost.test.ex,S=370 +++ b/test/mail/5000.new/4.myhost.test.ex,S=370 @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_tagged_ tag:,S=sss +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message diff --git a/test/mail/5000.new/5.myhost.test.ex b/test/mail/5000.new/5.myhost.test.ex index 4430aa64c..054bf9048 100644 --- a/test/mail/5000.new/5.myhost.test.ex +++ b/test/mail/5000.new/5.myhost.test.ex @@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_tagged_ tag:${if eq{0}{1}{rhubarb}fail} +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message diff --git a/test/mail/5000.new/6.myhost.test.ex b/test/mail/5000.new/6.myhost.test.ex index 77f583f18..df71e1788 100644 --- a/test/mail/5000.new/6.myhost.test.ex +++ b/test/mail/5000.new/6.myhost.test.ex @@ -3,8 +3,6 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_tagged_ tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -12,6 +10,8 @@ tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message diff --git a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S index 861a2d61d..be53589ee 100644 --- a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S +++ b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S @@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: maildir:maildir_taggedX_ tag:,S=sss:2,S +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/mail/5002.new/1.myhost.test.ex b/test/mail/5002.new/1.myhost.test.ex index b212d52da..4b8954864 100644 --- a/test/mail/5002.new/1.myhost.test.ex +++ b/test/mail/5002.new/1.myhost.test.ex @@ -2,9 +2,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message of a reasonable size. Fifty here. This is a message of a reasonable size. Fifty here. diff --git a/test/mail/5004.new/1.mail.test.ex b/test/mail/5004.new/1.mail.test.ex index 9685588cd..88be14504 100644 --- a/test/mail/5004.new/1.mail.test.ex +++ b/test/mail/5004.new/1.mail.test.ex @@ -2,8 +2,8 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Testing diff --git a/test/mail/5005.nofile/new/1.myhost.test.ex b/test/mail/5005.nofile/new/1.myhost.test.ex index 001bbcf77..5da3db575 100644 --- a/test/mail/5005.nofile/new/1.myhost.test.ex +++ b/test/mail/5005.nofile/new/1.myhost.test.ex @@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message for nofile diff --git a/test/mail/5005.userx/new/2.myhost.test.ex b/test/mail/5005.userx/new/2.myhost.test.ex index 0edfe533c..dcb7049b8 100644 --- a/test/mail/5005.userx/new/2.myhost.test.ex +++ b/test/mail/5005.userx/new/2.myhost.test.ex @@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message diff --git a/test/mail/5006.userx/new/1.myhost.test.ex b/test/mail/5006.userx/new/1.myhost.test.ex index d9a403d25..4db91ee5a 100644 --- a/test/mail/5006.userx/new/1.myhost.test.ex +++ b/test/mail/5006.userx/new/1.myhost.test.ex @@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message diff --git a/test/mail/5050.userx b/test/mail/5050.userx index 2131c6497..2b5ed9885 100644 --- a/test/mail/5050.userx +++ b/test/mail/5050.userx @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Initial test message, no prefix. @@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix. diff --git a/test/mail/5050.usery b/test/mail/5050.usery index 32d932a83..fd87afe8a 100644 --- a/test/mail/5050.usery +++ b/test/mail/5050.usery @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix. diff --git a/test/mail/5050.userz b/test/mail/5050.userz index 59b203319..75b251f9f 100644 --- a/test/mail/5050.userz +++ b/test/mail/5050.userz @@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix. @@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for mbx_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message with mbx_ prefix From CALLER@test.ex Tue Mar 02 09:44:33 1999 @@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second test message, no prefix. diff --git a/test/mail/5101.copied b/test/mail/5101.copied index f1b3d8e64..4704c33ff 100644 --- a/test/mail/5101.copied +++ b/test/mail/5101.copied @@ -4,10 +4,10 @@ Envelope-to: userx@myhost.test.ex, Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: mailbox: copied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Recipient: local_part= domain=myhost.test.ex X-Home: /usr @@ -18,13 +18,13 @@ Envelope-to: CALLER@myhost.test.ex Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: jack@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Recipient: local_part=CALLER domain=myhost.test.ex X-Home: @@ -42,10 +42,10 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: mailbox: copied +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. @@ -54,13 +54,13 @@ Envelope-to: CALLER@myhost.test.ex Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: jack@myhost.test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-Recipient: local_part=CALLER domain=myhost.test.ex X-Home: @@ -78,9 +78,9 @@ Return-path: Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is another test message. diff --git a/test/mail/5200.postmaster b/test/mail/5200.postmaster index 6617c7b0c..0068db5da 100644 --- a/test/mail/5200.postmaster +++ b/test/mail/5200.postmaster @@ -5,12 +5,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz) id 10HmaY-0005vi-00 for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Auto-Submitted: auto-replied From: Mail Delivery System To: postmaster@test.ex Subject: Message frozen +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 10HmaX-0005vi-00 has been frozen. The sender is . diff --git a/test/mail/5203.userx b/test/mail/5203.userx index 2dca8a448..1cb2875ec 100644 --- a/test/mail/5203.userx +++ b/test/mail/5203.userx @@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message max fd = dddd 0 opt=0 STATUS 1 opt=0 STATUS 2 opt=0 STATUS diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER index 2dfc48952..d468c4a9d 100644 --- a/test/mail/5204.CALLER +++ b/test/mail/5204.CALLER @@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@some.host Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for "FAIL cannot route this one (FAIL)"@some.host; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message diff --git a/test/mail/5207.qpgm b/test/mail/5207.qpgm index 7bf586034..da024f7a8 100644 --- a/test/mail/5207.qpgm +++ b/test/mail/5207.qpgm @@ -2,17 +2,17 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 From CALLER@test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0021 b/test/rejectlog/0021 index 04c1f3a94..edfe63fe9 100644 --- a/test/rejectlog/0021 +++ b/test/rejectlog/0021 @@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: userx@test1 + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 F= rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL Envelope-from: Envelope-to: @@ -15,9 +15,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: ok@test2 + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaZ-0005vi-00 F= rejected by non-SMTP ACL: no verified certificate Envelope-from: Envelope-to: @@ -25,9 +25,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: ok@test4 + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL 1999-03-02 09:44:33 H=[10.9.8.8] U=CALLER rejected MAIL 1999-03-02 09:44:33 mail accepted "mail from:" "" @@ -42,9 +42,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: userx@test1 + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmbB-0005vi-00 F= rejected by non-SMTP ACL: don't like sender userx@test1 Envelope-from: Envelope-to: @@ -52,8 +52,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: userx@test1 + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex 1999-03-02 09:44:33 mail accepted "mail from: SIZE=ssss" " SIZE=1234" diff --git a/test/rejectlog/0026 b/test/rejectlog/0026 index 2d97471f9..716e35cf0 100644 --- a/test/rejectlog/0026 +++ b/test/rejectlog/0026 @@ -5,27 +5,27 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: @ +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ Envelope-from: <> Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaY-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: , @ +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaZ-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F= rejected after DATA: body contains trigger Envelope-from: @@ -34,17 +34,17 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: x@y + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T to: group name: x@y, p@q; R reply-to: group name:; +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning diff --git a/test/rejectlog/0027 b/test/rejectlog/0027 index bff8a746c..9a9421433 100644 --- a/test/rejectlog/0027 +++ b/test/rejectlog/0027 @@ -13,24 +13,24 @@ Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaX-0005vi-00 for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: Subject: data1 +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL Envelope-from: <> Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaY-0005vi-00 for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: Subject: data2 +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL Envelope-from: <> Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaZ-0005vi-00 for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: Subject: data3 +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0028 b/test/rejectlog/0028 index c1888ad68..32a9d0576 100644 --- a/test/rejectlog/0028 +++ b/test/rejectlog/0028 @@ -5,7 +5,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER F= rejected RCPT : SIZE value too big diff --git a/test/rejectlog/0181 b/test/rejectlog/0181 index 47ca48209..ea4814552 100644 --- a/test/rejectlog/0181 +++ b/test/rejectlog/0181 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from U=CALLER: message too big: read=225 max=100 Envelope-from: Envelope-to: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 rejected from U=CALLER: message too big: read=101 max=100 Envelope-from: Envelope-to: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0220 b/test/rejectlog/0220 index f322fefc3..0ea1b2a0b 100644 --- a/test/rejectlog/0220 +++ b/test/rejectlog/0220 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500 Envelope-from: <> Envelope-to: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0221 b/test/rejectlog/0221 index f322fefc3..0ea1b2a0b 100644 --- a/test/rejectlog/0221 +++ b/test/rejectlog/0221 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500 Envelope-from: <> Envelope-to: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0365 b/test/rejectlog/0365 index 30b7ac01f..5dbe6259a 100644 --- a/test/rejectlog/0365 +++ b/test/rejectlog/0365 @@ -4,18 +4,18 @@ Envelope-to: P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) id 10HmaY-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: bad@domain +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER sender verify defer for : could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete sender verify callout 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F= rejected after DATA @@ -25,18 +25,18 @@ P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) id 10HmbA-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: F From: +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : failure message 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : defer message diff --git a/test/rejectlog/0451 b/test/rejectlog/0451 index ef3633778..e2616875e 100644 --- a/test/rejectlog/0451 +++ b/test/rejectlog/0451 @@ -6,9 +6,9 @@ P Received: from CALLER (helo=a.b.c.d) (envelope-from ) id 10HmaX-0005vi-00 for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: Sender verify failed Envelope-from: Envelope-to: @@ -17,6 +17,6 @@ P Received: from CALLER (helo=a.b.c.d) (envelope-from ) id 10HmaX-0005vi-00 for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0465 b/test/rejectlog/0465 index 51402d1fa..cab143858 100644 --- a/test/rejectlog/0465 +++ b/test/rejectlog/0465 @@ -4,6 +4,6 @@ Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaX-0005vi-00 for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: abc@xyz. +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0468 b/test/rejectlog/0468 index c86cd555d..b2ece3e1f 100644 --- a/test/rejectlog/0468 +++ b/test/rejectlog/0468 @@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F= rejected after DATA: message body message end Envelope-from: Envelope-to: @@ -15,6 +15,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0490 b/test/rejectlog/0490 index 47afbaa7c..ef53406f4 100644 --- a/test/rejectlog/0490 +++ b/test/rejectlog/0490 @@ -5,6 +5,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for aa@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0505 b/test/rejectlog/0505 index dd1021153..2c56b7f1e 100644 --- a/test/rejectlog/0505 +++ b/test/rejectlog/0505 @@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx: cannot use "control=submission" in EHLO or HELO ACL 1999-03-02 09:44:33 10HmaY-0005vi-00 F= rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL Envelope-from: @@ -16,7 +16,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER temporarily rejected connection in "connect" ACL: cannot use "control=queue_only" in connection ACL diff --git a/test/rejectlog/0507 b/test/rejectlog/0507 index 28b2f5f7e..957071a1f 100644 --- a/test/rejectlog/0507 +++ b/test/rejectlog/0507 @@ -5,10 +5,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: a@b.c, himself +I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F= rejected after DATA: bcc recipient detected Envelope-from: Envelope-to: @@ -16,10 +16,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: a@b.c, himself +I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F= rejected after DATA: bcc recipient detected Envelope-from: Envelope-to: @@ -28,9 +28,9 @@ Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: a@b.c, himself * Cc: unqualified, userx@dom.com, x@y.z C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z +I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0536 b/test/rejectlog/0536 index d395838c7..bf06473b6 100644 --- a/test/rejectlog/0536 +++ b/test/rejectlog/0536 @@ -23,9 +23,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: user1@test.ex + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 F= rejected by non-SMTP ACL: 599 Main code Envelope-from: Envelope-to: @@ -33,9 +33,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: user2@test.ex + Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : No code 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : Main code 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : Main and extended code diff --git a/test/rejectlog/0539 b/test/rejectlog/0539 index 6191a89fb..74da8e6e1 100644 --- a/test/rejectlog/0539 +++ b/test/rejectlog/0539 @@ -9,6 +9,6 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stderr/0275 b/test/stderr/0275 index 0838fe389..79cdb9dfc 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -119,9 +119,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0278 b/test/stderr/0278 index a262cb712..39c5a5692 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -78,9 +78,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0294 b/test/stderr/0294 index 896e8ea39..184cf9f41 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -29,9 +29,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: x@y + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line @@ -57,9 +57,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: x@y + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0317 b/test/stderr/0317 index c0ea3d0b4..8cd90b29b 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -10,12 +10,12 @@ Cc: a@b.c Bcc: p@q.r >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: x@y.z C Cc: a@b.c * Bcc: p@q.r +I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0361 b/test/stderr/0361 index 62c2b9d4c..07e0ce3d1 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -27,9 +27,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0388 b/test/stderr/0388 index eaa4ec044..f7855826f 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -186,13 +186,13 @@ rewrite_one_header: type=T: To: CALLER@myhost.test.ex search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: X-Failed-Recipients: x@y Auto-Submitted: auto-replied F From: Mail Delivery System T To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0402 b/test/stderr/0402 index 902c14095..20c2e7b3f 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -28,9 +28,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 expanding: ${tod_full} diff --git a/test/stderr/0404 b/test/stderr/0404 index 4f8296add..d37788c05 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -87,8 +87,6 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, @@ -121,7 +119,9 @@ R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@ **** debug string too long - truncated **** +I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line @@ -265,14 +265,14 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.e **** debug string too long - truncated **** In-Reply-To: References: Auto-Submitted: auto-replied +I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0408 b/test/stderr/0408 index 4fae9e9f6..8eeab810c 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -20,9 +20,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0465 b/test/stderr/0465 index d4d4fd203..4c84b1453 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -63,9 +63,9 @@ rewrite_one_header: type=T: To: abc@domain. search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: abc@domain. +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line @@ -125,9 +125,9 @@ rewrite_one_header: type=T: To: abc@xyz. search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: T To: abc@xyz. +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/0489 b/test/stderr/0489 index ffcf33dec..291dda645 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -10,9 +10,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: "Phil Q. Hazel" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line @@ -40,9 +40,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: John "Jack" Smith + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line @@ -69,9 +69,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: John "Jack" "Q." Smith + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaZ-0005vi-00 >>Generated Received: header line @@ -98,9 +98,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: "John (Jack) Q. Smith" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmbA-0005vi-00 >>Generated Received: header line @@ -127,9 +127,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: John ("Jack") "Q." Smith + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmbB-0005vi-00 >>Generated Received: header line @@ -156,9 +156,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: "John (\"Jack\") Q. Smith" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmbC-0005vi-00 >>Generated Received: header line @@ -185,9 +185,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: "Phil \"Q Hazel" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmbD-0005vi-00 >>Generated Received: header line @@ -214,9 +214,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: "Phil \"Q" "X." Hazel + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmbE-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/2600 b/test/stderr/2600 index bc770e28d..64b3133b1 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -294,9 +294,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/5004 b/test/stderr/5004 index 0272c2a04..4d6968f19 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -22,9 +22,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/5005 b/test/stderr/5005 index a471ce79a..e27fbfaac 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -20,9 +20,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line @@ -188,9 +188,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line @@ -356,9 +356,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaZ-0005vi-00 >>Generated Received: header line @@ -535,9 +535,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmbA-0005vi-00 >>Generated Received: header line diff --git a/test/stderr/5006 b/test/stderr/5006 index af10c5b13..1dd6dc9ce 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -20,9 +20,9 @@ rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: - Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line diff --git a/test/stdout/0015 b/test/stdout/0015 index d4c476794..d82e3cbc9 100644 --- a/test/stdout/0015 +++ b/test/stdout/0015 @@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for S+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 More text. . @@ -40,9 +40,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for Userx-S@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 More text. . diff --git a/test/stdout/0033 b/test/stdout/0033 index 5df5759d1..82aa1e93e 100644 --- a/test/stdout/0033 +++ b/test/stdout/0033 @@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -47,9 +47,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0035 b/test/stdout/0035 index c80d9fd9d..6b5928b77 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -174,9 +174,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) (envelope-from ) id 10HmaY-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: a@y +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaZ-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID <> @@ -196,8 +196,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) id 10HmaZ-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbA-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID @@ -239,10 +239,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) (envelope-from ) id 10HmbB-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: ddd* Sender: sender@some.where +047I Message-Id: dddF From: a@y +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbC-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID @@ -263,10 +263,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) (envelope-from ) id 10HmbC-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: dddS Sender: sender@some.where +047I Message-Id: dddF From: a@y +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbD-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID @@ -287,7 +287,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) (envelope-from ) id 10HmbD-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: ddd* Sender: sender@some.where +047I Message-Id: dddF From: SomeName +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0037 b/test/stdout/0037 index 4c8bdd5c2..603298279 100644 --- a/test/stdout/0037 +++ b/test/stdout/0037 @@ -239,11 +239,11 @@ Recipient = CALLER@test.ex Testing Exim filter file "TESTSUITE/aux-var/0037.F" Testprint: ------------------------------------------------ -Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: \nTest-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing +Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: \nDate: Tue, 2 Mar 1999 09:44:33 +0000 Testprint: ------------------------------------------------ Headers remove "test-headers:more-test-headers" Headers add "added-header: this is added\nadded-header2: a second line" -Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: \nFrom: x@y\nSubject: testing, testing\nadded-header: this is added\nadded-header2: a second line +Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: \nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line Testprint: ------------------------------------------------ Testprint: message_size = 122 Testprint: message_body_size = 0 diff --git a/test/stdout/0093 b/test/stdout/0093 index 236300048..4762c64ac 100644 --- a/test/stdout/0093 +++ b/test/stdout/0093 @@ -27,11 +27,11 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0093.f-3" Testprint: From: is defined Testprint: Absent: is not defined Testprint: ---------------------- -Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: \nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME +Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: \nSender: CALLER_NAME \nDate: Tue, 2 Mar 1999 09:44:33 +0000 Testprint: ---------------------- -Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: \nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME +++more +Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: \nSender: CALLER_NAME \nDate: Tue, 2 Mar 1999 09:44:33 +0000+++more Testprint: ---------------------- -Testprint: +++Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: \nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME +++ +Testprint: +++From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: \nSender: CALLER_NAME \nDate: Tue, 2 Mar 1999 09:44:33 +0000+++ Testprint: ---------------------- Testprint: From: >a@b< Testprint: this header is repeated\n and continued\nthis header is repeated\n and continued\nthis header is repeated\n and continued diff --git a/test/stdout/0100 b/test/stdout/0100 index 5d260e735..f4c25d7e5 100644 --- a/test/stdout/0100 +++ b/test/stdout/0100 @@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: ..dotheader: This is perfectly legal +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot @@ -46,10 +46,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbM-0005vi-00 for userx@filtered.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: ..dotheader: This is perfectly legal +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/stdout/0101 b/test/stdout/0101 index aeda5eb54..c5e6a37c3 100644 --- a/test/stdout/0101 +++ b/test/stdout/0101 @@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: ..dotheader: This is perfectly legal +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/stdout/0143 b/test/stdout/0143 index 32e92d513..1075fed7f 100644 --- a/test/stdout/0143 +++ b/test/stdout/0143 @@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0163 b/test/stdout/0163 index bd377b1ff..8e8832381 100644 --- a/test/stdout/0163 +++ b/test/stdout/0163 @@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 diff --git a/test/stdout/0177 b/test/stdout/0177 index af69f2b2c..f558f08d2 100644 --- a/test/stdout/0177 +++ b/test/stdout/0177 @@ -23,10 +23,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: freeze this (3) +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a third message to be frozen. . diff --git a/test/stdout/0179 b/test/stdout/0179 index 50583d25c..9013698df 100644 --- a/test/stdout/0179 +++ b/test/stdout/0179 @@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -32,9 +32,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for abcd@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0185 b/test/stdout/0185 index a7122b1d6..dba278f72 100644 --- a/test/stdout/0185 +++ b/test/stdout/0185 @@ -19,10 +19,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: freeze this +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message to be frozen. . diff --git a/test/stdout/0203 b/test/stdout/0203 index a59fabdbf..b311e114c 100644 --- a/test/stdout/0203 +++ b/test/stdout/0203 @@ -16,9 +16,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . diff --git a/test/stdout/0209 b/test/stdout/0209 index 238adf062..90a59b259 100644 --- a/test/stdout/0209 +++ b/test/stdout/0209 @@ -32,9 +32,9 @@ DATA Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . diff --git a/test/stdout/0210 b/test/stdout/0210 index 6a2f71d6c..2eedebd91 100644 --- a/test/stdout/0210 +++ b/test/stdout/0210 @@ -14,9 +14,9 @@ DATA 345 Send it Received: from CALLER by the.local.host.name with local (Exim x.yz) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/stdout/0215 b/test/stdout/0215 index a4a9b8639..d6d06cfe6 100644 --- a/test/stdout/0215 +++ b/test/stdout/0215 @@ -18,9 +18,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -53,9 +53,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -93,9 +93,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -140,9 +140,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -173,9 +173,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -205,9 +205,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/stdout/0217 b/test/stdout/0217 index 662e156fb..be5634b31 100644 --- a/test/stdout/0217 +++ b/test/stdout/0217 @@ -21,9 +21,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -310,9 +310,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbP-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0218 b/test/stdout/0218 index d26e24f48..c7f853fc5 100644 --- a/test/stdout/0218 +++ b/test/stdout/0218 @@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 . @@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 . @@ -82,9 +82,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 3 . diff --git a/test/stdout/0231 b/test/stdout/0231 index bd6eb49d8..f74359cac 100644 --- a/test/stdout/0231 +++ b/test/stdout/0231 @@ -20,15 +20,15 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: a@test.ex, b@test.ex, a-rewrite@domain2, b-rewrite@domain2, a@domain3, b@domain3 To: a@test.ex, b@test.ex, a-other@domain2, b-other@domain2, a@domain3, b@domain3 Reply-to: a@test.ex, b@test.ex, a-other@domain2, b-other@domain2, a@domain3, b@domain3 +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0242 b/test/stdout/0242 index dbcbe94d9..7dc9a2e1b 100644 --- a/test/stdout/0242 +++ b/test/stdout/0242 @@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . @@ -40,10 +40,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: Subject: Test message +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0245 b/test/stdout/0245 index 9bd0dfc25..36332a61b 100644 --- a/test/stdout/0245 +++ b/test/stdout/0245 @@ -26,9 +26,9 @@ aaa@bbb dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: 036T To: <"abc def"@test.ex>, xxx@yyy ddd* Bcc: aaa@bbb +047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0250 b/test/stdout/0250 index 310f57896..1d364b4e9 100644 --- a/test/stdout/0250 +++ b/test/stdout/0250 @@ -20,14 +20,14 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: ddd* From: userx@test.ex dddF From: userx-rewritten@test.ex +047I Message-Id: ddd* X-rewrote-original-recipient: SomeOne@test.ex ddd* Sender: CALLER_NAME dddS Sender: CALLER_NAME ddd* X-rewrote-sender: CALLER@test.ex +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaY-0005vi-00-H CALLER UID GID @@ -50,14 +50,14 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: ddd* From: usery@test.ex dddF From: usery-rewritten@test.ex +047I Message-Id: ddd* X-rewrote-original-recipient: OtherOne@test.ex ddd* Sender: CALLER_NAME dddS Sender: CALLER_NAME ddd* X-rewrote-sender: CALLER@test.ex +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaZ-0005vi-00-H CALLER UID GID @@ -80,9 +80,9 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: ddd* X-rewrote-original-recipient: ThirdOne@test.ex ddd* From: CALLER_NAME dddF From: CALLER_NAME ddd* X-rewrote-sender: CALLER@test.ex +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0253 b/test/stdout/0253 index 5165278db..e289e817f 100644 --- a/test/stdout/0253 +++ b/test/stdout/0253 @@ -16,9 +16,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: pqr@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 3 . @@ -42,9 +42,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: pqr@x.y.z +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 3 . diff --git a/test/stdout/0285 b/test/stdout/0285 index 84ba5b550..37a681a08 100644 --- a/test/stdout/0285 +++ b/test/stdout/0285 @@ -17,9 +17,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -42,9 +42,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -68,9 +68,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -93,9 +93,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -119,9 +119,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0286 b/test/stdout/0286 index e65518e57..993817efa 100644 --- a/test/stdout/0286 +++ b/test/stdout/0286 @@ -17,9 +17,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -47,9 +47,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -62,9 +62,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -96,9 +96,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -130,9 +130,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0288 b/test/stdout/0288 index 5c1cf83e0..8f36a023d 100644 --- a/test/stdout/0288 +++ b/test/stdout/0288 @@ -16,9 +16,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0299 b/test/stdout/0299 index 7f74352b9..798f402e6 100644 --- a/test/stdout/0299 +++ b/test/stdout/0299 @@ -17,9 +17,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -32,9 +32,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0311 b/test/stdout/0311 index 8641c1a6c..45190072f 100644 --- a/test/stdout/0311 +++ b/test/stdout/0311 @@ -20,12 +20,12 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: ddd* return-path: x@y ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 ddd* envelope-to: p@q +047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaY-0005vi-00-H CALLER UID GID @@ -48,9 +48,9 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: 017 return-path: x@y ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 ddd* envelope-to: p@q +047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0332 b/test/stdout/0332 index 91787967f..d1593fa4e 100644 --- a/test/stdout/0332 +++ b/test/stdout/0332 @@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 . @@ -33,9 +33,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 . diff --git a/test/stdout/0333 b/test/stdout/0333 index 91787967f..d1593fa4e 100644 --- a/test/stdout/0333 +++ b/test/stdout/0333 @@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 1 . @@ -33,9 +33,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message 2 . diff --git a/test/stdout/0338 b/test/stdout/0338 index ca25c66ff..a97751353 100644 --- a/test/stdout/0338 +++ b/test/stdout/0338 @@ -25,6 +25,6 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0363 b/test/stdout/0363 index 44397685a..a3160693f 100644 --- a/test/stdout/0363 +++ b/test/stdout/0363 @@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for Aa%Bb@Cc; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: To: aa%bb@cc +Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0367 b/test/stdout/0367 index 6036dac9a..b54aff8ff 100644 --- a/test/stdout/0367 +++ b/test/stdout/0367 @@ -16,9 +16,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . @@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 4 . @@ -50,9 +50,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 3 . @@ -67,9 +67,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 2 . diff --git a/test/stdout/0374 b/test/stdout/0374 index 7b3bd443d..f9844eb3b 100644 --- a/test/stdout/0374 +++ b/test/stdout/0374 @@ -14,9 +14,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0375 b/test/stdout/0375 index 5555ddb0d..6e0080d5b 100644 --- a/test/stdout/0375 +++ b/test/stdout/0375 @@ -14,9 +14,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -73,9 +73,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0377 b/test/stdout/0377 index 5e3c1dd4e..59742e666 100644 --- a/test/stdout/0377 +++ b/test/stdout/0377 @@ -22,6 +22,6 @@ cccc@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0378 b/test/stdout/0378 index 39d447a45..e64fdef16 100644 --- a/test/stdout/0378 +++ b/test/stdout/0378 @@ -21,6 +21,6 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0379 b/test/stdout/0379 index d19ba85a1..7bfea116f 100644 --- a/test/stdout/0379 +++ b/test/stdout/0379 @@ -21,6 +21,6 @@ aaaa@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0389 b/test/stdout/0389 index e3e357dd2..69b1bfc00 100644 --- a/test/stdout/0389 +++ b/test/stdout/0389 @@ -27,6 +27,6 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0431 b/test/stdout/0431 index 49a01f003..5e17ec9d6 100644 --- a/test/stdout/0431 +++ b/test/stdout/0431 @@ -16,9 +16,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -41,9 +41,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0440 b/test/stdout/0440 index 095cf71fc..7433e27b4 100644 --- a/test/stdout/0440 +++ b/test/stdout/0440 @@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x1@y1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 First message . @@ -32,9 +32,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for x3@y3; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Third message . @@ -49,9 +49,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for x2@y2; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Second message . diff --git a/test/stdout/0461 b/test/stdout/0461 index 2b6000e3f..16c0f34e6 100644 --- a/test/stdout/0461 +++ b/test/stdout/0461 @@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message . @@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message . @@ -65,9 +65,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Short message . diff --git a/test/stdout/0467 b/test/stdout/0467 index 9610b5dd0..553dda850 100644 --- a/test/stdout/0467 +++ b/test/stdout/0467 @@ -34,9 +34,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for x@srv27.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0474 b/test/stdout/0474 index 3b852fea2..ee42c1e32 100644 --- a/test/stdout/0474 +++ b/test/stdout/0474 @@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test data. . diff --git a/test/stdout/0488 b/test/stdout/0488 index 4f7635181..ff89ff2f7 100644 --- a/test/stdout/0488 +++ b/test/stdout/0488 @@ -25,9 +25,9 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 011 X-1: first 012 X-2: second 011 X-3: third diff --git a/test/stdout/0490 b/test/stdout/0490 index b9d5d3762..f9cb83d19 100644 --- a/test/stdout/0490 +++ b/test/stdout/0490 @@ -29,6 +29,6 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for bb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0495 b/test/stdout/0495 index 874b217fb..35df989f5 100644 --- a/test/stdout/0495 +++ b/test/stdout/0495 @@ -39,9 +39,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This should succeed . @@ -113,9 +113,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This should succeed (alias to normal address) . @@ -140,9 +140,9 @@ Received: from CALLER (helo=a.b) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: sen@der +Date: Tue, 2 Mar 1999 09:44:33 +0000 This should succeed. . diff --git a/test/stdout/0497 b/test/stdout/0497 index 7d078592e..3462fd1b3 100644 --- a/test/stdout/0497 +++ b/test/stdout/0497 @@ -61,9 +61,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 452 temporary error @@ -129,9 +129,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbL-0005vi-00 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 452 temporary error diff --git a/test/stdout/0498 b/test/stdout/0498 index deedca63a..f1448ba45 100644 --- a/test/stdout/0498 +++ b/test/stdout/0498 @@ -30,9 +30,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . *sleep 2 diff --git a/test/stdout/0514 b/test/stdout/0514 index 82f8ca6e5..83111ea92 100644 --- a/test/stdout/0514 +++ b/test/stdout/0514 @@ -23,6 +23,6 @@ dddP Received: from "spaced user" by myhost.test.ex with local (Exim x.yz) (envelope-from <"spaced user"@myhost.test.ex>) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: CALLER_NAME <"spaced user"@myhost.test.ex> +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0531 b/test/stdout/0531 index b6fb54437..01438bd35 100644 --- a/test/stdout/0531 +++ b/test/stdout/0531 @@ -17,9 +17,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -44,9 +44,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -70,9 +70,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/stdout/0543 b/test/stdout/0543 index b14cfff77..6b6a6067f 100644 --- a/test/stdout/0543 +++ b/test/stdout/0543 @@ -31,9 +31,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . diff --git a/test/stdout/0554 b/test/stdout/0554 index c00390d90..8c0cfea8a 100644 --- a/test/stdout/0554 +++ b/test/stdout/0554 @@ -31,9 +31,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0560 b/test/stdout/0560 index e2893572e..45a84cf13 100644 --- a/test/stdout/0560 +++ b/test/stdout/0560 @@ -2,12 +2,12 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: From: Somebody To: first@test.ex another@another.ex Subject: Testing -Mvc +Message-Id: Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message of no great importance. diff --git a/test/stdout/3401 b/test/stdout/3401 index 66b1dd316..fda6814c5 100644 --- a/test/stdout/3401 +++ b/test/stdout/3401 @@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -51,9 +51,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -79,9 +79,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -141,9 +141,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for forcesender@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK @@ -189,9 +189,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/3404 b/test/stdout/3404 index 90c228e79..c78436c71 100644 --- a/test/stdout/3404 +++ b/test/stdout/3404 @@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< . @@ -48,9 +48,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >zzz< . @@ -81,9 +81,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< . diff --git a/test/stdout/3405 b/test/stdout/3405 index 15782630d..6020e0591 100644 --- a/test/stdout/3405 +++ b/test/stdout/3405 @@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< X-TAID: >CALLER< @@ -49,9 +49,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< X-TAID: >CALLER< diff --git a/test/stdout/3412 b/test/stdout/3412 index 7511f43fb..b7c7a379f 100644 --- a/test/stdout/3412 +++ b/test/stdout/3412 @@ -18,13 +18,13 @@ DATA Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: X-Failed-Recipients: x@test.ex Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 This message was created automatically by mail delivery software. @@ -41,9 +41,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/3415 b/test/stdout/3415 index 7adb9f6f6..7bbd8061e 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -165,10 +165,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) (envelope-from ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: a@y dddS Sender: username@myhost.test.ex +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaY-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID <> @@ -190,9 +190,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) id 10HmaY-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: username@myhost.test.ex +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaZ-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID <> @@ -214,9 +214,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) id 10HmaZ-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: username@another.domain +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbA-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID <> @@ -238,9 +238,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) id 10HmbA-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: dddF From: username@auth.id.domain +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbB-0005vi-00-H EXIMUSER EXIM_UID EXIM_GID <> @@ -262,7 +262,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) id 10HmbB-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: dddF From: abc@x.y.z +047I Message-Id: dddS Sender: username@auth.id.domain +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/3501 b/test/stdout/3501 index aec3f5def..e29d425ff 100644 --- a/test/stdout/3501 +++ b/test/stdout/3501 @@ -21,9 +21,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/5102 b/test/stdout/5102 index c0054572e..372019227 100644 --- a/test/stdout/5102 +++ b/test/stdout/5102 @@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -69,9 +69,9 @@ DATA Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message .