Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 8fbf948373404c9f9ff581804111933653504709..2980133410623191d64e70a1477ca0231e1af7ef 100644 (file)
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -24,7 +24,9 @@ Test message 5.
 ****
 exim -bs -oMa 10.9.8.7
 ****
 ****
 exim -bs -oMa 10.9.8.7
 ****

-exim -d-all+acl+lists -bs -oMa 10.9.8.8
+exim -DLOG_SELECTOR=-connection_reject -bs -oMa 10.9.8.7
+****
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -bs -oMa 10.9.8.8

 mail from:<bad@test1>
 mail from:<ok@test1>
 rcpt to:<x@y>
 mail from:<bad@test1>
 mail from:<ok@test1>
 rcpt to:<x@y>


@@ -40,10 +42,11 @@ exim -bs -oMa 10.9.8.10
 helo x.y.z
 quit
 ****
 helo x.y.z
 quit
 ****

-exim -d-all+acl+lists -odi -bs -oMa 10.9.8.8
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8

 mail from:<ok@test3>
 rcpt to:<x@y>
 data
 mail from:<ok@test3>
 rcpt to:<x@y>
 data

+

 Some message
 .
 quit
 Some message
 .
 quit


@@ -60,7 +63,7 @@ exim -DBR=no_bounce_return_body -odi -f userx@test1 userx
 Test message 1.
 .
 ****
 Test message 1.
 .
 ****

-exim -odi -bs -oMa 10.9.8.8
+exim -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8

 ehlo test.ex
 mail from: <ok@test3> SIZE=1234
 rcpt to:<x@y>
 ehlo test.ex
 mail from: <ok@test3> SIZE=1234
 rcpt to:<x@y>


@@ -69,3 +72,11 @@ Some message
 .
 quit
 ****
 .
 quit
 ****

+#
+# Test returncode and logging for no extractable recipients
+1
+exim -odi -t
+From: userx@test1
+To:
+Subject: this should get a bounce, too
+****