From a57ce043b4c47bd069343100b602e14fad38c43c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 10 Sep 2016 21:37:56 +0100 Subject: Log EHLO response on getting conn-close response for HELO. Bug 1832 --- test/log/0211 | 4 ++++ test/scripts/0000-Basic/0211 | 16 ++++++++++++++++ test/scripts/5730-OCSP-GnuTLS-events/5730 | 4 +++- test/stdout/0211 | 7 +++++++ 4 files changed, 30 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/log/0211 b/test/log/0211 index 9a5824674..cbf33c612 100644 --- a/test/log/0211 +++ b/test/log/0211 @@ -28,3 +28,7 @@ 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 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 Test: reject ehlo, then close (late, giving time for HELO) +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbB-0005vi-00 H=localhost4.test.ex [127.0.0.1]: Remote host closed connection in response to HELO the.local.host.name (EHLO response was: 550 You are banned) +1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@domain1 R=others T=smtp defer (-18) H=localhost4.test.ex [127.0.0.1]: Remote host closed connection in response to HELO the.local.host.name (EHLO response was: 550 You are banned) diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211 index f8750d2e8..dbe41c723 100644 --- a/test/scripts/0000-Basic/0211 +++ b/test/scripts/0000-Basic/0211 @@ -59,3 +59,19 @@ QUIT exim -odi userx@domain1 usery@domain2 Test message 2 **** +# +exim -z "Test: reject ehlo, then close (late, giving time for HELO)" +**** +sudo rm DIR/spool/db/retry +server PORT_S +220 Connected OK +EHLO +550 You are banned +HELO +**** +exim -odi userx@domain1 +Test message 4 +**** +# +# +no_msglog_check diff --git a/test/scripts/5730-OCSP-GnuTLS-events/5730 b/test/scripts/5730-OCSP-GnuTLS-events/5730 index b86b03264..d22a1aa1f 100644 --- a/test/scripts/5730-OCSP-GnuTLS-events/5730 +++ b/test/scripts/5730-OCSP-GnuTLS-events/5730 @@ -52,7 +52,7 @@ test message. **** sleep 1 killdaemon -no_msglog_check +sudo rm DIR/spool/db/retry # # # @@ -65,6 +65,7 @@ test message. **** sleep 1 killdaemon +sudo rm DIR/spool/db/retry # # # @@ -82,3 +83,4 @@ killdaemon # # # +no_msglog_check diff --git a/test/stdout/0211 b/test/stdout/0211 index ebe8246b0..93e271c6a 100644 --- a/test/stdout/0211 +++ b/test/stdout/0211 @@ -36,3 +36,10 @@ HELO the.local.host.name QUIT 250 OK End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Connected OK +EHLO the.local.host.name +550 You are banned +HELO the.local.host.name +End of script -- cgit v1.2.3