From d093f8e514d0e914bae3dc34b4e4f0a51720c690 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 19 Dec 2016 13:10:29 +0000 Subject: Split out smtp_setup_conn() from smtp_deliver, in the transport --- test/log/0211 | 6 +++--- test/mail/0211.CALLER | 12 ++++++------ test/scripts/0000-Basic/0211 | 6 +++--- test/stdout/0211 | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/log/0211 b/test/log/0211 index cbf33c612..74acec3a3 100644 --- a/test/log/0211 +++ b/test/log/0211 @@ -14,7 +14,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 Test: reject connect 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=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 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 (A) 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 @@ -22,8 +22,8 @@ 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 Test: reject helo 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=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 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 (C) +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 (C) 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 bf77afff3..12511cd73 100644 --- a/test/mail/0211.CALLER +++ b/test/mail/0211.CALLER @@ -24,7 +24,7 @@ recipients. This is a permanent error. The following address(es) failed: userx@domain1 host localhost4.test.ex [127.0.0.1] SMTP error from remote mail server after initial connection: - 550 Go away + 550 Go away (A) --NNNNNNNNNN-eximdsn-MMMMMMMMMM Content-type: message/delivery-status @@ -35,7 +35,7 @@ Action: failed Final-Recipient: rfc822;userx@domain1 Status: 5.0.0 Remote-MTA: dns; localhost4.test.ex -Diagnostic-Code: smtp; 550 Go away +Diagnostic-Code: smtp; 550 Go away (A) --NNNNNNNNNN-eximdsn-MMMMMMMMMM Content-type: message/rfc822 @@ -80,11 +80,11 @@ recipients. This is a permanent error. The following address(es) failed: usery@domain2 host localhost4.test.ex [127.0.0.1] SMTP error from remote mail server after HELO the.local.host.name: - 550 Go away + 550 Go away (C) userx@domain1 host localhost4.test.ex [127.0.0.1] SMTP error from remote mail server after HELO the.local.host.name: - 550 Go away + 550 Go away (C) --NNNNNNNNNN-eximdsn-MMMMMMMMMM Content-type: message/delivery-status @@ -95,13 +95,13 @@ Action: failed Final-Recipient: rfc822;userx@domain1 Status: 5.0.0 Remote-MTA: dns; localhost4.test.ex -Diagnostic-Code: smtp; 550 Go away +Diagnostic-Code: smtp; 550 Go away (C) Action: failed Final-Recipient: rfc822;usery@domain2 Status: 5.0.0 Remote-MTA: dns; localhost4.test.ex -Diagnostic-Code: smtp; 550 Go away +Diagnostic-Code: smtp; 550 Go away (C) --NNNNNNNNNN-eximdsn-MMMMMMMMMM Content-type: message/rfc822 diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211 index dbe41c723..655b4dd96 100644 --- a/test/scripts/0000-Basic/0211 +++ b/test/scripts/0000-Basic/0211 @@ -38,7 +38,7 @@ exim -qf exim -z "Test: reject connect" **** server PORT_S -550 Go away +550 Go away (A) QUIT 250 OK **** @@ -50,9 +50,9 @@ exim -z "Test: reject helo" server PORT_S 220 Connected OK EHLO -550 Go away +550 Go away (B) HELO -550 Go away +550 Go away (C) QUIT 250 OK **** diff --git a/test/stdout/0211 b/test/stdout/0211 index 93e271c6a..2d484bda5 100644 --- a/test/stdout/0211 +++ b/test/stdout/0211 @@ -22,7 +22,7 @@ Connection request from [127.0.0.1] End of script Listening on port 1224 ... Connection request from [127.0.0.1] -550 Go away +550 Go away (A) QUIT 250 OK End of script @@ -30,9 +30,9 @@ Listening on port 1224 ... Connection request from [127.0.0.1] 220 Connected OK EHLO the.local.host.name -550 Go away +550 Go away (B) HELO the.local.host.name -550 Go away +550 Go away (C) QUIT 250 OK End of script -- cgit v1.2.3