Fix mismerge

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

diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462
index da7b714bff52fefaad5b6a2c9cc8a513b22d1e4d..fa6f3867862a8e97688f87ae89920d2a7b334847 100644 (file)
--- a/test/scripts/0000-Basic/0462
+++ b/test/scripts/0000-Basic/0462
@@ -19,6 +19,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 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>
 MAIL FROM:<Ok@localhost>
 RCPT TO:<checkpm@test.ex>
 RCPT TO:<nocheckpm@test.ex>


@@ -37,6 +38,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 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
 MAIL FROM:<NOTok@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT


@@ -54,6 +56,7 @@ QUIT
 250 OK
 ****
 sudo exim -DSELECTOR=-sender_verify_fail -d-all+verify -v -bs -oMa V4NET.0.0.2
 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
 MAIL FROM:<NOTok2@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT