Sync 4.next from master

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

diff --git a/test/scripts/0000-Basic/0376 b/test/scripts/0000-Basic/0376
index 7430a6bcea0ec153222f9c27eefb7c97fceee830..88eec49f50f4bf788e43fcd4bdfda25420e23198 100644 (file)
--- a/test/scripts/0000-Basic/0376
+++ b/test/scripts/0000-Basic/0376
@@ -3,7 +3,7 @@ need_ipv4
 #
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -33,7 +33,7 @@ QUIT
 # Test unsuccessful caching
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -55,7 +55,7 @@ QUIT
 # Test caching of rejection of MAIL FROM:<>
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 550 REJECT MAIL FROM
@@ -75,7 +75,7 @@ QUIT
 # Test caching of rejection of postmaster
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -103,7 +103,7 @@ QUIT
 # Test caching of accepting of postmaster
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -131,11 +131,11 @@ QUIT
 # Test caching of accepting a random address
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
-RCPT TO
+RCPT TO:<myhost.test.ex-
 250 OK
 QUIT
 250 OK
@@ -153,11 +153,11 @@ QUIT
 # Test caching of accepting a random address and postmaster
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
-RCPT TO
+RCPT TO:<myhost.test.ex-
 250 OK
 QUIT
 250 OK
@@ -175,23 +175,23 @@ QUIT
 # Test caching of rejecting a random address and postmaster
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
-MAIL FROM
+MAIL FROM:<>
 250 OK
-RCPT TO
+RCPT TO:<myhost.test.ex-
 550 NOT OK
 RSET
 250 OK
-MAIL FROM
+MAIL FROM:<>
 250 OK
-RCPT TO
+RCPT TO:<ok@otherhost41>
 250 OK
 RSET
 250 OK
-MAIL FROM
+MAIL FROM:<>
 250 OK
-RCPT TO
+RCPT TO:<postmaster@otherhost41>
 250 OK
 QUIT
 250 OK
@@ -210,7 +210,7 @@ QUIT
 # address has to be tested
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -232,7 +232,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -249,7 +249,7 @@ QUIT
 # Test caching of rejecting a random address
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -271,7 +271,7 @@ QUIT
 ****
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -289,7 +289,7 @@ QUIT
 sleep 2
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -312,7 +312,7 @@ QUIT
 # Timeout on the RCPT for random
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -327,7 +327,7 @@ QUIT
 # Postmaster_sender set non-empty
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -350,7 +350,7 @@ QUIT
 # Header_sender sender set non-empty
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -370,7 +370,7 @@ QUIT
 # Timeout on RCPT for header_sender (defer_ok test)
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -388,7 +388,7 @@ QUIT
 # Test full postmaster check
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -413,7 +413,7 @@ QUIT
 # Test postmaster_mailfrom with random
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK