Merge branch '4.next'

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

diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 2ec354ffdb945547c858798ba1a24c11825f01ed..0df1f0ae6a80a7fa8965aac18ad7a17582e09aef 100644 (file)
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -24,6 +24,8 @@ Test message 5.
 ****
 exim -bs -oMa 10.9.8.7
 ****
 ****
 exim -bs -oMa 10.9.8.7
 ****

+exim -DLOG_SELECTOR=-connection_reject -bs -oMa 10.9.8.7
+****

 exim -d-all+acl+lists -bs -oMa 10.9.8.8
 mail from:<bad@test1>
 mail from:<ok@test1>
 exim -d-all+acl+lists -bs -oMa 10.9.8.8
 mail from:<bad@test1>
 mail from:<ok@test1>


@@ -44,6 +46,28 @@ exim -d-all+acl+lists -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
+****
+# Test unsetting bounce_return_message for non-SMTP
+1
+exim -DBR=no_bounce_return_message -odi -f userx@test1 userx
+Test message 1.
+.
+****
+# Test unsetting bounce_return_body for non-SMTP
+1
+exim -DBR=no_bounce_return_body -odi -f userx@test1 userx
+Test message 1.
+.
+****
+exim -odi -bs -oMa 10.9.8.8
+ehlo test.ex
+mail from: <ok@test3> SIZE=1234
+rcpt to:<x@y>
+data

 Some message
 .
 quit
 Some message
 .
 quit