Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462
index a6f3622baf6870dc63e7e555450e4f8f985a1b06..fa6f3867862a8e97688f87ae89920d2a7b334847 100644 (file)
--- a/test/scripts/0000-Basic/0462
+++ b/test/scripts/0000-Basic/0462
@@ -3,7 +3,7 @@ need_ipv4
 #
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -19,6 +19,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
+HELO test
 MAIL FROM:<Ok@localhost>
 RCPT TO:<checkpm@test.ex>
 RCPT TO:<nocheckpm@test.ex>
@@ -27,7 +28,7 @@ QUIT
 # This one fails the actual address
 server PORT_S
 220 Server ready
-HELO
+EHLO
 250 OK
 MAIL FROM
 250 OK
@@ -37,7 +38,26 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
 MAIL FROM:<NOTok@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT
 ****
+# Same again, but with sender_verify_fail logging turned off
+server PORT_S
+220 Server ready
+EHLO
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+550 NO
+QUIT
+250 OK
+****
+sudo exim -DSELECTOR=-sender_verify_fail -d-all+verify -v -bs -oMa V4NET.0.0.2
+HELO test
+MAIL FROM:<NOTok2@elsewhere>
+RCPT TO:<nocheckpm@test.ex>
+QUIT
+****