Merge from master into 4.next

[exim.git] / test / scripts / 0000-Basic / 0211

diff --git a/test/scripts/0000-Basic/0211 b/test/scripts/0000-Basic/0211
index 2775d20ef6f6ad94ff269368e6978a6a36214c76..dbe41c723b15d53ed06ce96119e0ab1921e99426 100644 (file)
--- a/test/scripts/0000-Basic/0211
+++ b/test/scripts/0000-Basic/0211
@@ -2,6 +2,8 @@
 need_ipv4
 munge optional_dsn_info
 #
+exim -z "Test: temp-rej connect"
+****
 server PORT_S
 450 I'm busy
 QUIT
@@ -10,6 +12,9 @@ QUIT
 exim -odi userx@domain1
 Test message 1
 ****
+#
+exim -z "Test: temp-rej helo"
+****
 server PORT_S
 220 Connected OK
 EHLO
@@ -21,6 +26,17 @@ QUIT
 ****
 exim -qf
 ****
+#
+exim -z "Test: drop conn after banner"
+****
+server PORT_S
+220 Connected OK
+****
+exim -qf
+****
+#
+exim -z "Test: reject connect"
+****
 server PORT_S
 550 Go away
 QUIT
@@ -28,6 +44,9 @@ QUIT
 ****
 exim -qf
 ****
+#
+exim -z "Test: reject helo"
+****
 server PORT_S
 220 Connected OK
 EHLO
@@ -40,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