hosts_require_helo

6 files changed, 45 insertions, 0 deletions

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 9a9f4d7bd..290db16f8 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -22,6 +22,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
 mail from:<a@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -45,6 +51,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -84,6 +96,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
 mail from:<b@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -115,6 +133,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
 mail from:<c@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114
index edf3b6c11..b5245fd37 100644
--- a/test/scripts/2100-OpenSSL/2114
+++ b/test/scripts/2100-OpenSSL/2114
@@ -55,6 +55,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -74,6 +76,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -110,6 +114,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -153,6 +159,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
@@ -172,6 +180,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index cdf4ed2fd..9aa4c1a8c 100644
--- a/test/scripts/2100-OpenSSL/2132
+++ b/test/scripts/2100-OpenSSL/2132
@@ -14,6 +14,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -38,6 +40,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -79,6 +83,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
diff --git a/test/scripts/2100-OpenSSL/2135 b/test/scripts/2100-OpenSSL/2135
index ff460c671..fe7447c0e 100644
--- a/test/scripts/2100-OpenSSL/2135
+++ b/test/scripts/2100-OpenSSL/2135
@@ -9,6 +9,7 @@ exim -bd -DSERVER=server -oX PORT_D
 # "proxied TLS", and the DATA smtp command only done by the transport process.
 # cmdline -bs send
 exim -d-all+transport -bs
+helo test
 mail from:<usera@ok.example>
 rcpt to:<userb@test.ex>
 data
diff --git a/test/scripts/2100-OpenSSL/2137 b/test/scripts/2100-OpenSSL/2137
index 36c36fe11..1cce83d66 100644
--- a/test/scripts/2100-OpenSSL/2137
+++ b/test/scripts/2100-OpenSSL/2137
@@ -5,6 +5,7 @@ exim -bd -DSERVER=server -oX PORT_D
 ****
 # cmdline -bs send, rcpt-time defer
 exim -bs
+helo test
 mail from:<>
 rcpt to:<rcpt_defer@test.ex>
 quit
@@ -13,6 +14,7 @@ sleep 3
 #
 # cmdline -bs send, data-time defer
 exim -bs
+helo test
 mail from:<>
 rcpt to:<data_defer@test.ex>
 data
diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
index 9ee9eb13f..162436e29 100644
--- a/test/scripts/2100-OpenSSL/2150
+++ b/test/scripts/2100-OpenSSL/2150
@@ -15,6 +15,8 @@ ehlo abcd
 ??? 250
 starttls
 ??? 220
+helo test
+??? 250
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>