Merge branch 'master' into 4.next

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

diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0585
index c4ae477c1b10253fa8540a8b8d03d5a880a3439f..b4d8258936f2c6f547ef2a852422db6ca3d2fb7f 100644 (file)
--- a/test/scripts/0000-Basic/0585
+++ b/test/scripts/0000-Basic/0585
@@ -2,6 +2,7 @@
 #
 # Accept: the env rcpt matches a header To:
 exim -odq -bs
 #
 # Accept: the env rcpt matches a header To:
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -11,6 +12,7 @@ quit
 ****
 ### Reject: no match
 exim -odq -bs
 ****
 ### Reject: no match
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -20,6 +22,7 @@ quit
 ****
 ### Reject, with specific SMTP message
 exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
 ****
 ### Reject, with specific SMTP message
 exim -DERROR_DETAILS=smtp_return_error_details -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -29,6 +32,7 @@ quit
 ****
 ### Accept, matches in header CC:
 exim -odq -bs
 ****
 ### Accept, matches in header CC:
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>


@@ -40,6 +44,7 @@ quit
 ****
 ### Reject: To: & CC: combo, an env rcpt missing
 exim -odq -bs
 ****
 ### Reject: To: & CC: combo, an env rcpt missing
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>


@@ -52,6 +57,7 @@ quit
 ****
 ### Accept: Resent-To: & Resent-CC: combo
 exim -odq -bs
 ****
 ### Accept: Resent-To: & Resent-CC: combo
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>