From 5980e62829e10336b008f861c938bfca799d488a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 3 Sep 2015 16:13:18 +0100 Subject: [PATCH] Testsuite: a DSN case for a remote-MTA specified by name rather than IP --- test/confs/0211 | 2 +- test/log/0211 | 14 +++++++------- test/mail/0211.CALLER | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/confs/0211 b/test/confs/0211 index 89e98a4ea..dd714a2a9 100644 --- a/test/confs/0211 +++ b/test/confs/0211 @@ -34,7 +34,7 @@ begin routers others: driver = manualroute domains = ! +local_domains - route_list = * 127.0.0.1 byname + route_list = * localhost4.test.ex byname self = send transport = smtp no_more diff --git a/test/log/0211 b/test/log/0211 index 07deb3b12..35da72e04 100644 --- a/test/log/0211 +++ b/test/log/0211 @@ -1,20 +1,20 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy +1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy +1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F= R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away +1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F= R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER F=<> R=all T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F= R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** usery@domain2 F= R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F= R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** usery@domain2 F= R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER F=<> R=all T=local_delivery 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER index c863f58b5..bf77afff3 100644 --- a/test/mail/0211.CALLER +++ b/test/mail/0211.CALLER @@ -22,7 +22,7 @@ A message that you sent could not be delivered to one or more of its recipients. This is a permanent error. The following address(es) failed: userx@domain1 - host 127.0.0.1 [127.0.0.1] + host localhost4.test.ex [127.0.0.1] SMTP error from remote mail server after initial connection: 550 Go away @@ -34,7 +34,7 @@ Reporting-MTA: dns; the.local.host.name Action: failed Final-Recipient: rfc822;userx@domain1 Status: 5.0.0 -Remote-MTA: dns; 127.0.0.1 +Remote-MTA: dns; localhost4.test.ex Diagnostic-Code: smtp; 550 Go away --NNNNNNNNNN-eximdsn-MMMMMMMMMM @@ -78,11 +78,11 @@ A message that you sent could not be delivered to one or more of its recipients. This is a permanent error. The following address(es) failed: usery@domain2 - host 127.0.0.1 [127.0.0.1] + host localhost4.test.ex [127.0.0.1] SMTP error from remote mail server after HELO the.local.host.name: 550 Go away userx@domain1 - host 127.0.0.1 [127.0.0.1] + host localhost4.test.ex [127.0.0.1] SMTP error from remote mail server after HELO the.local.host.name: 550 Go away @@ -94,13 +94,13 @@ Reporting-MTA: dns; the.local.host.name Action: failed Final-Recipient: rfc822;userx@domain1 Status: 5.0.0 -Remote-MTA: dns; 127.0.0.1 +Remote-MTA: dns; localhost4.test.ex Diagnostic-Code: smtp; 550 Go away Action: failed Final-Recipient: rfc822;usery@domain2 Status: 5.0.0 -Remote-MTA: dns; 127.0.0.1 +Remote-MTA: dns; localhost4.test.ex Diagnostic-Code: smtp; 550 Go away --NNNNNNNNNN-eximdsn-MMMMMMMMMM -- 2.25.1