Gitweb:
https://git.exim.org/exim.git/commitdiff/98d4eb7a840b78c80cae38aa09e2196d23cad383
Commit: 98d4eb7a840b78c80cae38aa09e2196d23cad383
Parent: 436bda2ac0c4a245815db3fc1ef2aedee05eab8d
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Jun 26 12:36:49 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Wed Jun 26 12:36:49 2019 +0100
Testsuite: output changes resulting
Broken-by: 436bda2ac0
---
test/mail/0015.CALLER | 4 ++--
test/mail/0037.CALLER | 4 ++--
test/mail/0048.CALLER | 10 +++++-----
test/mail/0098.CALLER | 6 +++---
test/mail/0103.CALLER | 2 +-
test/mail/0136.forwarder | 4 ++--
test/mail/0164.CALLER | 4 ++--
test/mail/0165.CALLER | 4 ++--
test/mail/0224.CALLER | 10 +++++-----
test/mail/0226.CALLER | 6 +++---
test/mail/0237.CALLER | 6 +++---
test/mail/0383.CALLER | 6 +++---
test/mail/0428.CALLER | 4 ++--
test/mail/0508.postmaster | 2 +-
14 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index 01ec977..f251d97 100644
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -34,7 +34,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|callpager
+Final-Recipient: rfc822;page+userx@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -90,7 +90,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|callpager
+Final-Recipient: rfc822;page+ux@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 4ba7eef..1985986 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -118,7 +118,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|cat
+Final-Recipient: rfc822;filter-pipe@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -172,7 +172,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;/tmp/junk
+Final-Recipient: rfc822;filter-file@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index 5df1365..fc1201e 100644
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -76,7 +76,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;pipe@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -173,7 +173,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;prefixed+pipe@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -270,7 +270,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;pipe-suffixed@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -367,7 +367,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;prefixed+pipe-suffixed@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -464,7 +464,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;pipe@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index 722955e..2f83f91 100644
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -42,7 +42,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: delayed
-Final-Recipient: rfc822;|/non/existing/file
+Final-Recipient: rfc822;userx@???
Status: 4.0.0
Action: delayed
@@ -172,7 +172,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: delayed
-Final-Recipient: rfc822;|/non/existing/file
+Final-Recipient: rfc822;userx@???
Status: 4.0.0
Action: delayed
@@ -232,7 +232,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: delayed
-Final-Recipient: rfc822;|/non/existing/file
+Final-Recipient: rfc822;userx@???
Status: 4.0.0
Action: delayed
diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index 64ca04d..5461909 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -30,7 +30,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;WASabc@???
+Final-Recipient: rfc822;"abc@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 1aa46d6..511ecab 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -34,7 +34,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;unknown@???
+Final-Recipient: rfc822;forwarder@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -88,7 +88,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;unknown@???
+Final-Recipient: rfc822;forwarder@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 3a1b3d1..dbc44d5 100644
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -73,7 +73,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Final-Recipient: rfc822;system-filter
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -165,7 +165,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Final-Recipient: rfc822;system-filter
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 0c1cd68..30f63c9 100644
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -73,7 +73,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Final-Recipient: rfc822;system-filter
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -167,7 +167,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $recipients
+Final-Recipient: rfc822;system-filter
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index b050907..090003e 100644
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -35,11 +35,11 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;hbounce@???
+Final-Recipient: rfc822;useryx@???
Status: 5.0.0
Action: failed
-Final-Recipient: rfc822;bounce@???
+Final-Recipient: rfc822;userxx@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -105,15 +105,15 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: delayed
-Final-Recipient: rfc822;/no/such/file
+Final-Recipient: rfc822;file@???
Status: 4.0.0
Action: delayed
-Final-Recipient: rfc822;defer@???
+Final-Recipient: rfc822;userxy@???
Status: 4.0.0
Action: delayed
-Final-Recipient: rfc822;hdefer@???
+Final-Recipient: rfc822;useryy@???
Status: 4.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index 6fdc064..0b56536 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -32,11 +32,11 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;/a/b/c
+Final-Recipient: rfc822;/a/b/c@???
Status: 5.0.0
Action: failed
-Final-Recipient: rfc822;|/p/q/r
+Final-Recipient: rfc822;|/p/q/r@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -128,7 +128,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 2fa1643..9bd9e57 100644
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -30,11 +30,11 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;/a/b/c
+Final-Recipient: rfc822;/a/b/c@???
Status: 5.0.0
Action: failed
-Final-Recipient: rfc822;|/p/q/r
+Final-Recipient: rfc822;|/p/q/r@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -125,7 +125,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; the.local.host.name
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
index d2e55b6..5fa158a 100644
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -75,7 +75,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; myhost.test.ex
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $thisaddress $1
+Final-Recipient: rfc822;system-filter
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -170,7 +170,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; myhost.test.ex
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $1
+Final-Recipient: rfc822;system-filter
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -266,7 +266,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; myhost.test.ex
Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv $thisaddress $1
+Final-Recipient: rfc822;redking@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index ff0af0d..8feca08 100644
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -32,7 +32,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; mail.test.ex
Action: failed
-Final-Recipient: rfc822;userx-extra
+Final-Recipient: rfc822;restrict-userx@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -86,7 +86,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; mail.test.ex
Action: failed
-Final-Recipient: rfc822;inbox
+Final-Recipient: rfc822;restrict-userx@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index 4ff758a..bd36b3d 100644
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -40,7 +40,7 @@ Content-type: message/delivery-status
Reporting-MTA: dns; myhost.test.ex
Action: failed
-Final-Recipient: rfc822;|/bin/echo "Some pipe output"
+Final-Recipient: rfc822;userx@???
Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
