diff options
Diffstat (limited to 'test/scripts/0000-Basic')
141 files changed, 447 insertions, 7 deletions
diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index d3b4984fe..cc289e04e 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -1051,6 +1051,7 @@ exim -d -bh V4NET.0.0.2 **** # Test $reply_address exim -bh V4NET.0.0.0 +helo test mail from:<> rcpt to:<some@body> data @@ -1081,6 +1082,7 @@ quit **** # Check RFC 2047 decoding with (default) length check exim -bh V4NET.0.0.0 +helo test mail from:<> rcpt to:<some@body> data @@ -1090,6 +1092,7 @@ quit **** # Check RFC 2047 decoding with length check disabled exim -DLENCHECK=check_rfc2047_length=false -bh V4NET.0.0.0 +helo test mail from:<> rcpt to:<some@body> data diff --git a/test/scripts/0000-Basic/0003 b/test/scripts/0000-Basic/0003 index b3b3f89a3..97ec254a0 100644 --- a/test/scripts/0000-Basic/0003 +++ b/test/scripts/0000-Basic/0003 @@ -1,5 +1,6 @@ # Caseless address blocking exim -bh 1.1.1.1 +helo test mail from:<a@b.c> rcpt to:<x@test.ex> rset diff --git a/test/scripts/0000-Basic/0004 b/test/scripts/0000-Basic/0004 index 2732d001e..fe1029c63 100644 --- a/test/scripts/0000-Basic/0004 +++ b/test/scripts/0000-Basic/0004 @@ -1,5 +1,6 @@ # Caseful address blocking exim -bh 1.1.1.1 +helo test mail from:<a@b.c> rcpt to:<x@test.ex> rset diff --git a/test/scripts/0000-Basic/0005 b/test/scripts/0000-Basic/0005 index 8e7b0d8c1..ea8a9f228 100644 --- a/test/scripts/0000-Basic/0005 +++ b/test/scripts/0000-Basic/0005 @@ -1,5 +1,6 @@ # -bs to simple local delivery exim -bs -odi +helo test mail from:someone@some.domain rcpt to:CALLER@HOSTNAME data @@ -10,6 +11,7 @@ This is the last line. quit **** exim -bs -odi +helo test mail from:someone@some.domain rcpt to:CALLER@HOSTNAME data @@ -20,6 +22,7 @@ This is a second test message. quit **** exim_exim -bs -odq +helo test mail from:someone@some.domain rcpt to:CALLER@HOSTNAME data diff --git a/test/scripts/0000-Basic/0014 b/test/scripts/0000-Basic/0014 index a3c939a1b..84fe7a3bc 100644 --- a/test/scripts/0000-Basic/0014 +++ b/test/scripts/0000-Basic/0014 @@ -29,6 +29,7 @@ To: userx, jules@box1.plc.example, Reply-to: jules@box3.plc.example **** exim -odi -bs -oMa 10.0.0.2 +helo test mail from:<jules@box3.plc.example> rcpt to:<userx@test.ex> quit diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021 index 6e4b8474e..298013341 100644 --- a/test/scripts/0000-Basic/0021 +++ b/test/scripts/0000-Basic/0021 @@ -26,7 +26,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 +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> @@ -42,7 +42,7 @@ exim -bs -oMa 10.9.8.10 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 @@ -63,7 +63,7 @@ exim -DBR=no_bounce_return_body -odi -f userx@test1 userx 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> @@ -73,7 +73,7 @@ Some message quit **** # -# Test returncode and logginf for no extractable recipients +# Test returncode and logging for no extractable recipients 1 exim -odi -t From: userx@test1 diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022 index dd11aa236..9c7837304 100644 --- a/test/scripts/0000-Basic/0022 +++ b/test/scripts/0000-Basic/0022 @@ -1,5 +1,6 @@ # Extra ACLs: freeze/defer/drop/queue/delay/$host_data exim -d -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<warn_empty@test.ex> data @@ -9,6 +10,7 @@ Testing quit **** exim -d -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<warn_log@test.ex> data @@ -18,6 +20,7 @@ Testing quit **** exim -d -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<warn_user@test.ex> data @@ -27,6 +30,7 @@ Testing quit **** exim -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<defer@y> rcpt to:<accept@y> @@ -35,17 +39,20 @@ rcpt to:<rhubarb@y> quit **** exim -bh V4NET.9.8.7 +helo test mail from:<> rcpt to:<defer_senders@y> quit **** exim -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<delay_accept@y> rcpt to:<delay_warn@y> quit **** exim -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<host_check@y> rcpt to:<host_check@y> @@ -54,6 +61,7 @@ rcpt to:<host_check2@y> quit **** exim -bs -N -odi +helo test mail from:<x@y> rcpt to:<accept@y> rcpt to:<freeze@y> @@ -83,12 +91,14 @@ Testing 4 quit **** exim -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<nested_drop@y> rcpt to:<rhubarb@y> quit **** exim -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<nested_drop_require@y> rcpt to:<rhubarb@y> @@ -100,6 +110,8 @@ exim -DSERVER=server -odq -bd -oX PORT_D **** client -t5 127.0.0.1 PORT_D ??? 220 +helo test +??? 250 mail from:<x@y> ??? 250 rcpt to:<accept@y> diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023 index 40a5bd909..109037f69 100644 --- a/test/scripts/0000-Basic/0023 +++ b/test/scripts/0000-Basic/0023 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh 1.2.3.4 +helo test mail from:<x@y> rcpt to:<postmaster@test.ex> rcpt to:<z@z> @@ -15,6 +16,7 @@ rcpt to:<x@wontpass> quit **** exim -bh 5.6.7.8 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<x@test.ex> @@ -23,24 +25,28 @@ rcpt to:<spqr@test.ex> quit **** exim -bh 9.9.9.9 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<a@b> quit **** exim -bh 9.9.9.8 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<a@b> quit **** exim -bh 9.9.9.255 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<a@b> quit **** exim -bh 5.6.8.1 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<y@x> @@ -61,6 +67,7 @@ rset quit **** exim -bh 5.6.11.1 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<x2@y> @@ -68,23 +75,27 @@ rcpt to:<y2@y> quit **** exim -bh 5.6.12.1 +helo test mail from:<x@y> rcpt to:<x@ok> rcpt to:<x@y> quit **** exim -bh 5.6.12.2 +helo test mail from:<x@y> rcpt to:<x@ok> rcpt to:<x@y> quit **** exim -bh 8.8.8.8 +helo test mail from:<x@y> rcpt to:<x@y> quit **** exim -bh 5.6.13.1 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<x1@y> @@ -92,30 +103,35 @@ rcpt to:<x2@y> quit **** exim -bh V4NET.11.12.13 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<x1@y> quit **** exim -bh V4NET.11.12.12 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<x1@y> quit **** exim -bh 20.20.20.20 +helo test mail from:<x@y> rcpt to:<x1@y> rcpt to:<x2@y> quit **** exim -bh 20.20.20.20 +helo test mail from:<userx@y> rcpt to:<x1@y> rcpt to:<userx@y> quit **** exim -bh 21.21.21.21 +helo test mail from:<userx@y> rcpt to:<x1@y> rcpt to:<userx@y> @@ -130,12 +146,14 @@ rcpt to:<x@y> quit **** exim -bh 22.22.22.22 +helo test mail from:<userx@y> rcpt to:<userx@y> rcpt to:<x@y> quit **** exim -bh 23.23.23.0 +helo test mail from:<x@y> rcpt to:<userx@y> rset @@ -144,21 +162,25 @@ rcpt to:<userx@y> quit **** exim -bh 23.23.23.1 +helo test mail from:<x@y> rcpt to:<userx@y> quit **** exim -bh 24.24.24.24 +helo test mail from:<x@y> rcpt to:<userx@y> quit **** exim -bh 25.25.25.25 +helo test mail from:<x@y> rcpt to:<x@y> quit **** exim -bh 26.26.26.26 +helo test mail from:<> rcpt to:<x@y> rcpt to:<y@y> @@ -166,11 +188,13 @@ rcpt to:<z@y> quit **** exim -bh 27.27.27.27 +helo test mail from:<> rcpt to:<x@y> quit **** exim -bh 28.28.28.28 +helo test mail from:<> rcpt to:<x@y> rset @@ -182,27 +206,32 @@ rcpt to:<x@y> quit **** exim -bh V4NET.0.0.3 +helo test mail from:<> rcpt to:<x@y> quit **** exim -bh V4NET.0.0.97 +helo test mail from:<> rcpt to:<x@y> quit **** # This resolves to a name which will give `try again' when looked up exim -bh V4NET.99.99.96 +helo test mail from:<> rcpt to:<x@y> quit **** exim -bh V4NET.99.99.96 +helo test mail from:<> rcpt to:<defer_ok@y> quit **** exim -bh 29.29.29.29 +helo test mail from:<a@localhost> rcpt to:<x@y> rset @@ -211,6 +240,7 @@ rcpt to:<x@y> quit **** exim -bh 30.30.30.30 +helo test mail from:<a@ten-1> rcpt to:<x@y> rset @@ -222,11 +252,13 @@ rcpt to:<x@y> quit **** exim -bh 31.31.31.31 +helo test mail from:<x@y> rcpt to:<x@y> quit **** exim -odi -bs -oMa 32.32.32.32 +helo test mail from:<userx@test.ex> rcpt to:<userx-vs@test.ex> data @@ -235,6 +267,7 @@ Test with verify sender. quit **** exim -odi -bs -oMa 32.32.32.32 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -243,6 +276,7 @@ Test without verify sender. quit **** exim -bh 33.33.33.33 +helo test mail from:<x@y> rcpt to:<x1@y> rcpt to:<x2@y> @@ -250,11 +284,13 @@ quit **** # The 1 causes a 1-second delay in the test.again.dns lookup exim -bh 44.44.44.1 +helo test mail from:<x@y> rcpt to:<x@y> quit **** exim -odi -bs -oMa 55.55.55.55 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -263,6 +299,7 @@ ACL header adding test. quit **** exim -odi -bs -oMa 56.56.56.56 +helo test mail from:<userx@test.ex> rcpt to:<cond-yes@test.ex> data @@ -306,6 +343,7 @@ data quit **** exim -odi -bs -oMa 56.56.57.57 +helo test mail from:<userx@test.ex> rcpt to:<cond-yes@test.ex> data @@ -320,6 +358,7 @@ data quit **** exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56 +helo test mail from:<userx@test.ex> rcpt to:<cond-rhubarb@test.ex> data @@ -327,6 +366,7 @@ data quit **** exim -odi -bs -oMa 56.56.58.58 +helo test mail from:<rcpttest@test.ex> rcpt to:<ok1@test.ex> rcpt to:<bad1@test.ex> @@ -339,17 +379,20 @@ data quit **** exim -odi -bs -oMa 56.56.59.59 +helo test mail from:<rcpttest@test.ex> rcpt to:<fail@test.ex> quit **** exim -odi -bs -oMa V4NET.11.12.13 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<x1@y> quit **** exim -bh 60.60.60.60 +helo test mail from:<x@y> rcpt to:<x@y> rcpt to:<a@b> diff --git a/test/scripts/0000-Basic/0024 b/test/scripts/0000-Basic/0024 index e0cdc556b..862c6e35b 100644 --- a/test/scripts/0000-Basic/0024 +++ b/test/scripts/0000-Basic/0024 @@ -8,6 +8,7 @@ # deny x@ten-2.test.ex (good address, but sender verify failed) # exim -odi -oMa V4NET.0.0.0 -bs +helo test mail from:<x@y> rcpt to:<postmaster@test.ex> rcpt to:<userx@test.ex> @@ -27,6 +28,7 @@ quit # deny x@ten-2.test.ex (good address, but not relay domain or host) # accept EAI local part exim -odi -oMa V4NET.0.0.0 -bs +helo test mail from:<userx@test.ex> rcpt to:<postmaster@test.ex> rcpt to:<userx@test.ex> @@ -45,6 +47,7 @@ quit # accept x@ten-1.test.ex (good relay address) # accept x@ten-2.test.ex (good non-relay address, relay host) exim -odi -oMa V4NET.255.255.0 -bs +helo test mail from:<userx@test.ex> rcpt to:<bad@test.ex> rcpt to:<x@y> @@ -59,6 +62,7 @@ quit # accept postmaster@test.ex (postmaster at local domain) # deny anything else exim -odi -oMa V4NET.11.12.13 -bs +helo test mail from:<userx@test.ex> rcpt to:<postmaster@test.ex> rcpt to:<userx@test.ex> @@ -72,6 +76,7 @@ quit # accept postmaster@test.ex (postmaster at local domain) # deny anything else exim -odi -oMa V4NET.11.12.16 -bs +helo test mail from:<userx@test.ex> rcpt to:<postmaster@test.ex> rcpt to:<userx@test.ex> @@ -84,6 +89,7 @@ quit # Local SMTP - should accept everything # exim -odi -bs +helo test mail from:<x@y> rcpt to:<postmaster@test.ex> rcpt to:<userx@test.ex> diff --git a/test/scripts/0000-Basic/0025 b/test/scripts/0000-Basic/0025 index 8d5e00512..3ed7cf6df 100644 --- a/test/scripts/0000-Basic/0025 +++ b/test/scripts/0000-Basic/0025 @@ -1,5 +1,6 @@ # ACL with -bs exim -odi -bs +helo test mail from:<x@y> rcpt to:<userx@test.ex> rcpt to:<x@y> diff --git a/test/scripts/0000-Basic/0026 b/test/scripts/0000-Basic/0026 index 9d30d2d07..cb1a3081f 100644 --- a/test/scripts/0000-Basic/0026 +++ b/test/scripts/0000-Basic/0026 @@ -2,6 +2,7 @@ # # Syntax OK, non-null sender => should be accepted exim -odq -bs +helo test mail from:<x@y> rcpt to:<x@y> data @@ -11,6 +12,7 @@ quit **** # Syntax error in header => should fail exim -odq -bs +helo test mail from:<x@y> rcpt to:<x@y> data @@ -22,6 +24,7 @@ quit **** # Syntax error (version 2) in header => should fail exim -odq -bs +helo test mail from:<x@y> rcpt to:<x@y> data @@ -35,6 +38,7 @@ quit **** # Syntax error in header => should fail even with null sender exim -odq -bs +helo test mail from:<> rcpt to:<x@y> data @@ -46,6 +50,7 @@ quit **** # Null sender, invalid sender in header => fail exim -odq -bs +helo test mail from:<> rcpt to:<x@y> data @@ -57,6 +62,7 @@ quit **** # Null sender, valid sender in header => accept exim -odq -bs +helo test mail from:<> rcpt to:<x@y> data @@ -69,6 +75,7 @@ quit **** # Syntax OK, non-null sender, but bad data => reject exim -odq -bs +helo test mail from:<x@y> rcpt to:<x@y> data @@ -78,6 +85,7 @@ quit **** # Syntax OK, non-null sender, good data exim -odi -bs +helo test mail from:<x@y> rcpt to:<userx@test.ex> data @@ -87,6 +95,7 @@ quit **** # -bh test: Syntax error in header => should fail exim -bh 10.0.0.0 +helo test mail from:<x@y> rcpt to:<x@y> data @@ -98,6 +107,7 @@ quit **** # -bh test: Syntax OK, non-null sender, but bad data => reject exim -bh 10.0.0.0 +helo test mail from:<x@y> rcpt to:<x@y> data @@ -107,6 +117,7 @@ quit **** # Group syntax in reply-to header exim -odi -bs +helo test mail from:<x@y> rcpt to:<userx@test.ex> data @@ -120,6 +131,7 @@ quit # Group syntax in reply-to header, but no address (falls back to From: for # header_sender check - From: is valid) exim -odi -bs +helo test mail from:<> rcpt to:<userx@test.ex> data @@ -134,6 +146,7 @@ quit # Group syntax in reply-to header, but no address (falls back to From: for # header_sender check - but there is no From:) exim -odi -bs +helo test mail from:<> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0027 b/test/scripts/0000-Basic/0027 index 606c1095f..ca4be73ea 100644 --- a/test/scripts/0000-Basic/0027 +++ b/test/scripts/0000-Basic/0027 @@ -2,6 +2,7 @@ # # Invalid sender, should reject both exim -bs +helo test mail from:<x@y> rcpt to:<userx@test.ex> rcpt to:<postmaster@test.ex> @@ -9,6 +10,7 @@ quit **** # Valid sender, should only reject userx exim -bs +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> rcpt to:<postmaster@test.ex> @@ -16,6 +18,7 @@ quit **** # ACL misconfigurations at RCPT time exim -bs +helo test mail from:<> rcpt to:<"deny verify = header_syntax"@test.ex> rcpt to:<"deny verify = junk"@test.ex> @@ -26,6 +29,7 @@ quit **** # ACL misconfiguration at DATA time exim -bs +helo test mail from:<> rcpt to:<data@test.ex> data @@ -35,6 +39,7 @@ quit **** # ACL misconfiguration at DATA time exim -bs +helo test mail from:<> rcpt to:<data@test.ex> data @@ -44,6 +49,7 @@ quit **** # ACL misconfiguration at DATA time exim -bs +helo test mail from:<> rcpt to:<data@test.ex> data diff --git a/test/scripts/0000-Basic/0028 b/test/scripts/0000-Basic/0028 index 4cf458d4e..d3fb0f7d2 100644 --- a/test/scripts/0000-Basic/0028 +++ b/test/scripts/0000-Basic/0028 @@ -2,6 +2,7 @@ # # SIZE unset - should reject at DATA time exim -bs +helo test mail from:<x@y> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0029 b/test/scripts/0000-Basic/0029 index d1f297e24..eea2dc7b4 100644 --- a/test/scripts/0000-Basic/0029 +++ b/test/scripts/0000-Basic/0029 @@ -1,5 +1,6 @@ # ACL with sender=address exim -bs +helo test mail from:<ok@test.ex> rcpt to:<a@b1> rset diff --git a/test/scripts/0000-Basic/0030 b/test/scripts/0000-Basic/0030 index b200e2704..f6c3adda0 100644 --- a/test/scripts/0000-Basic/0030 +++ b/test/scripts/0000-Basic/0030 @@ -1,5 +1,6 @@ # Use of $address_data in ACL exim -bs +helo test mail from:<> rcpt to:<ok@test.ex> rcpt to:<notok@test.ex> diff --git a/test/scripts/0000-Basic/0034 b/test/scripts/0000-Basic/0034 index 1c8c38016..879298c12 100644 --- a/test/scripts/0000-Basic/0034 +++ b/test/scripts/0000-Basic/0034 @@ -16,6 +16,7 @@ ehlo a.b.c ehlo a.b.c **** exim -bs +helo test rset mail from:<x@y> rcpt to:<x@y> diff --git a/test/scripts/0000-Basic/0049 b/test/scripts/0000-Basic/0049 index e3146a083..855d936b2 100644 --- a/test/scripts/0000-Basic/0049 +++ b/test/scripts/0000-Basic/0049 @@ -22,6 +22,7 @@ Sender: Sender in original <sender@original.ex> This is a test message. **** exim -bs -odi +helo test mail from:userx@cus.cam.ac.uk rcpt to:userx@test.ex data @@ -58,6 +59,7 @@ From: From person <from@some.where> This is a test message. **** exim -bs -odi +helo test mail from:userx@somehost.test.ex rcpt to:userx@test.ex data diff --git a/test/scripts/0000-Basic/0050 b/test/scripts/0000-Basic/0050 index 82e5cad0e..8f69599b4 100644 --- a/test/scripts/0000-Basic/0050 +++ b/test/scripts/0000-Basic/0050 @@ -22,6 +22,7 @@ Sender: Sender in original <sender@original.ex> This is a test message 4. **** exim -bs -odi +helo test mail from:userx@cus.cam.ac.uk rcpt to:userx@test.ex data @@ -63,6 +64,7 @@ From: From person <from@some.where> This is a test message 10. **** exim -bs -odi +helo test mail from:userx@somehost.test.ex rcpt to:userx@test.ex data diff --git a/test/scripts/0000-Basic/0056 b/test/scripts/0000-Basic/0056 index 5e033ce1e..86354532a 100644 --- a/test/scripts/0000-Basic/0056 +++ b/test/scripts/0000-Basic/0056 @@ -1,5 +1,6 @@ # domain list set to * exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@otherhost.example.com> diff --git a/test/scripts/0000-Basic/0057 b/test/scripts/0000-Basic/0057 index 0c39e13ec..5e9fc7821 100644 --- a/test/scripts/0000-Basic/0057 +++ b/test/scripts/0000-Basic/0057 @@ -1,5 +1,6 @@ # domain list = !* and other ! and percent_hack domains exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0058 b/test/scripts/0000-Basic/0058 index 4b0771444..60f2248e1 100644 --- a/test/scripts/0000-Basic/0058 +++ b/test/scripts/0000-Basic/0058 @@ -1,5 +1,6 @@ # Relay by hostlist * exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@anotherhost.example.com> data diff --git a/test/scripts/0000-Basic/0059 b/test/scripts/0000-Basic/0059 index 85c971651..a3c045652 100644 --- a/test/scripts/0000-Basic/0059 +++ b/test/scripts/0000-Basic/0059 @@ -1,5 +1,6 @@ # Relay by hostlist !* exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0060 b/test/scripts/0000-Basic/0060 index 87981047c..84b8fc4c1 100644 --- a/test/scripts/0000-Basic/0060 +++ b/test/scripts/0000-Basic/0060 @@ -1,5 +1,6 @@ # Relay by hostlist match for host name or IP address exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -16,6 +18,7 @@ data quit **** exim -bh V4NET.0.0.5 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -24,6 +27,7 @@ data quit **** exim -bh V4NET.0.0.6 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -32,6 +36,7 @@ data quit **** exim -bh V4NET.255.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -40,6 +45,7 @@ data quit **** exim -bh V4NET.255.0.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -48,6 +54,7 @@ data quit **** exim -bh V4NET.255.0.3 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -56,6 +63,7 @@ data quit **** exim -bh V4NET.255.0.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0061 b/test/scripts/0000-Basic/0061 index 5177f8eac..90d586429 100644 --- a/test/scripts/0000-Basic/0061 +++ b/test/scripts/0000-Basic/0061 @@ -1,5 +1,6 @@ # Relay by hostlist @ exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0062 b/test/scripts/0000-Basic/0062 index b5802a0f4..5cff10c80 100644 --- a/test/scripts/0000-Basic/0062 +++ b/test/scripts/0000-Basic/0062 @@ -1,5 +1,6 @@ # Relay by hostlist end name match exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -16,6 +18,7 @@ data quit **** exim -bh V4NET.0.0.3 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0063 b/test/scripts/0000-Basic/0063 index 61abb6ef1..d34dfa3d9 100644 --- a/test/scripts/0000-Basic/0063 +++ b/test/scripts/0000-Basic/0063 @@ -1,5 +1,6 @@ # Relay by hostlist regex match exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0064 b/test/scripts/0000-Basic/0064 index a6ff0df12..5d027c3c1 100644 --- a/test/scripts/0000-Basic/0064 +++ b/test/scripts/0000-Basic/0064 @@ -1,5 +1,6 @@ # Relay by hostlist lsearch exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0065 b/test/scripts/0000-Basic/0065 index d7862004c..df45d9313 100644 --- a/test/scripts/0000-Basic/0065 +++ b/test/scripts/0000-Basic/0065 @@ -1,5 +1,6 @@ # Relay by hostlist matching by network exim -bh 1.2.3.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh 1.2.3.5 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -16,6 +18,7 @@ data quit **** exim -bh 1.2.4.5 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -24,6 +27,7 @@ data quit **** exim -bh 1.3.2.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -32,6 +36,7 @@ data quit **** exim -bh 131.111.8.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -40,6 +45,7 @@ data quit **** exim -bh 192.152.98.3 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -48,6 +54,7 @@ data quit **** exim -bh 192.153.98.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0066 b/test/scripts/0000-Basic/0066 index cb4492ed1..09db4f920 100644 --- a/test/scripts/0000-Basic/0066 +++ b/test/scripts/0000-Basic/0066 @@ -1,5 +1,6 @@ # Relay by hostlist matching host or network exim -bh 1.2.3.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -8,6 +9,7 @@ data quit **** exim -bh 1.2.3.5 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -16,6 +18,7 @@ data quit **** exim -bh 1.2.4.5 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -24,6 +27,7 @@ data quit **** exim -bh 1.3.2.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -32,6 +36,7 @@ data quit **** exim -bh 131.111.8.2 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -40,6 +45,7 @@ data quit **** exim -bh 192.152.98.3 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -48,6 +54,7 @@ data quit **** exim -bh V4NET.0.0.1 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -56,6 +63,7 @@ data quit **** exim -bh V4NET.11.12.13 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> @@ -64,6 +72,7 @@ data quit **** exim -bh V4NET.0.0.3 +helo test mail from:<userx@somehost.example.com> rcpt to:<userx@test.ex> rcpt to:<userx@anotherhost.example.com> diff --git a/test/scripts/0000-Basic/0067 b/test/scripts/0000-Basic/0067 index 5212719c3..0ff4ef84c 100644 --- a/test/scripts/0000-Basic/0067 +++ b/test/scripts/0000-Basic/0067 @@ -1,5 +1,6 @@ # sender_reject (various, including @@) exim -bh 1.2.3.4 +helo test mail from:<userx@somehost.example.com> rcpt to:<x@test.ex> rset diff --git a/test/scripts/0000-Basic/0068 b/test/scripts/0000-Basic/0068 index dd8cce033..8243dc5ff 100644 --- a/test/scripts/0000-Basic/0068 +++ b/test/scripts/0000-Basic/0068 @@ -1,5 +1,6 @@ # recipients_max_reject exim -bh V4NET.10.10.10 +helo test mail from:<x@y> rcpt to:<a@b> rcpt to:<a@b> diff --git a/test/scripts/0000-Basic/0069 b/test/scripts/0000-Basic/0069 index 9170dfc58..729d19f5e 100644 --- a/test/scripts/0000-Basic/0069 +++ b/test/scripts/0000-Basic/0069 @@ -2,41 +2,49 @@ need_ipv4 # exim -bh V4NET.0.0.1 +helo test mail from:<x@y> rcpt to:<x@test.ex> quit **** exim -bh V4NET.0.0.13 +helo test MAIL FROM:<userx> rcpt to:<x@test.ex> quit **** exim -bh V4NET.0.0.13 +helo test MAIL FROM:<userx@test.ex> rcpt to:<y@test.ex> quit **** exim -bh V4NET.0.0.13 +helo test MAIL FROM:<userx@test.ex> rcpt to:<z@test.ex> quit **** exim -bh V4NET.0.0.13 -DLOG_SELECTOR=log_selector=+unknown_in_list +helo test MAIL FROM:<userx@test.ex> rcpt to:<y@test.ex> quit **** exim -bh V4NET.0.0.13 +helo test MAIL FROM:<userx> rcpt to:<a@test.ex> quit **** exim -bh V4NET.0.0.13 +helo test MAIL FROM:<userx@test.ex> rcpt to:<b@test.ex> quit **** exim -bh V4NET.0.0.13 +helo test MAIL FROM:<userx@test.ex> rcpt to:<c@test.ex> quit diff --git a/test/scripts/0000-Basic/0077 b/test/scripts/0000-Basic/0077 index 715bd289e..493a7ae6e 100644 --- a/test/scripts/0000-Basic/0077 +++ b/test/scripts/0000-Basic/0077 @@ -1,15 +1,18 @@ # host_reject !@ : !localhost exim -bh 127.0.0.1 +helo test mail from:<x@test.ex> rcpt to:<x@test.ex> quit **** exim -bh V4NET.10.10.10 +helo test mail from:<x@test.ex> rcpt to:<x@test.ex> quit **** exim -bh V4NET.0.0.1 +helo test mail from:<x@test.ex> rcpt to:<x@test.ex> quit diff --git a/test/scripts/0000-Basic/0079 b/test/scripts/0000-Basic/0079 index 0875ed0c4..3ade8af3a 100644 --- a/test/scripts/0000-Basic/0079 +++ b/test/scripts/0000-Basic/0079 @@ -29,6 +29,7 @@ test message data quit **** exim -odi -bs +helo test mail from:<postmaster@exim.test.ex> rcpt to:<userx@exim.test.ex> data diff --git a/test/scripts/0000-Basic/0086 b/test/scripts/0000-Basic/0086 index 0a7582ebe..639b24d23 100644 --- a/test/scripts/0000-Basic/0086 +++ b/test/scripts/0000-Basic/0086 @@ -1,5 +1,6 @@ # verify = header_syntax exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -12,6 +13,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -26,6 +28,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -40,6 +43,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -94,6 +98,7 @@ Cc: "abcd@x.y.z (missing quote), QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -106,6 +111,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.9 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0087 b/test/scripts/0000-Basic/0087 index 8e65e8006..d2a0daf2a 100644 --- a/test/scripts/0000-Basic/0087 +++ b/test/scripts/0000-Basic/0087 @@ -1,5 +1,6 @@ # verify = header_sender & sender exim -bh V4NET.10.10.10 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -12,6 +13,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -25,6 +27,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -37,6 +40,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -49,6 +53,7 @@ Subject: testing QUIT **** exim -bh V4NET.10.10.10 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0091 b/test/scripts/0000-Basic/0091 index 89025e757..a97cf16be 100644 --- a/test/scripts/0000-Basic/0091 +++ b/test/scripts/0000-Basic/0091 @@ -1,5 +1,6 @@ # sender_verify_hosts exim -bh V4NET.0.0.1 +helo test mail from:<junk@jink.jonk.test.ex> rcpt to:<root@test.ex> data @@ -8,6 +9,7 @@ From: <junk@jink.jonk.test.ex> quit **** exim -bh V4NET.0.0.2 +helo test mail from:<junk@jink.jonk.test.ex> rcpt to:<root@test.ex> data @@ -15,6 +17,7 @@ data quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@test.ex> rcpt to:<root@test.ex> data @@ -23,6 +26,7 @@ From: <junk@jink.jonk.test.ex> quit **** exim -bh V4NET.0.0.2 +helo test mail from:<userx@test.ex> rcpt to:<root@test.ex> data diff --git a/test/scripts/0000-Basic/0092 b/test/scripts/0000-Basic/0092 index d22feebb3..f7ab4e42c 100644 --- a/test/scripts/0000-Basic/0092 +++ b/test/scripts/0000-Basic/0092 @@ -8,6 +8,7 @@ # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s 1 3 exim -bs +helo test mail from: userx@test.ex rcpt to: userx@test.ex data @@ -21,6 +22,7 @@ data # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s 1 3 exim -bh V4NET.0.0.1 +helo test mail from:userx@test.ex rcpt to:userx@test.ex data @@ -31,6 +33,7 @@ The quick brown fox # late-expansion of smtp_receive_timeout 1 3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1 +helo test mail from:userx@test.ex rcpt to:userx@test.ex data @@ -52,6 +55,7 @@ jumps over the lazy dog. # stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s 1 3 exim -bh V4NET.0.0.1 +helo test mail from: userx@test.ex rcpt to: verify@test.ex **** diff --git a/test/scripts/0000-Basic/0094 b/test/scripts/0000-Basic/0094 index 87fb5309f..1e9021cd1 100644 --- a/test/scripts/0000-Basic/0094 +++ b/test/scripts/0000-Basic/0094 @@ -1,16 +1,19 @@ # Reverse lookup failures munge dnssec exim -bh V4NET.11.12.13 +helo test mail from:<userx@cam.ac.uk> rcpt to:<userx@cam.ac.uk> quit **** exim -bh V4NET.0.0.1 +helo test mail from:<userx@cam.ac.uk> rcpt to:<userx@cam.ac.uk> quit **** sudo exim -odi -oMa V4NET.11.12.13 -bs +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -19,12 +22,14 @@ This is a test message quit **** exim -d -bh V4NET.99.99.90 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> rcpt to:<userx@cam.ac.uk> quit **** sudo exim -odi -oMa 99.99.99.99 -bs +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -33,6 +38,7 @@ This is a test message quit **** sudo exim -odi -oMa V4NET.99.99.96 -bs +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0121 b/test/scripts/0000-Basic/0121 index 9daae6448..85392b6a6 100644 --- a/test/scripts/0000-Basic/0121 +++ b/test/scripts/0000-Basic/0121 @@ -1,5 +1,6 @@ # Sender verification SMTP (envelope and header) exim -bh 127.0.0.1 +helo test mail from:<unknown@test.ex> rcpt to:<userx@test.ex> rset diff --git a/test/scripts/0000-Basic/0124 b/test/scripts/0000-Basic/0124 index fccedda6b..3274b6133 100644 --- a/test/scripts/0000-Basic/0124 +++ b/test/scripts/0000-Basic/0124 @@ -1,5 +1,6 @@ # host lookup failure error message exim -bh V4NET.0.0.97 +helo test mail from:<userx@test.ex> rcpt to:<userx@external.test.ex> rset diff --git a/test/scripts/0000-Basic/0127 b/test/scripts/0000-Basic/0127 index 430d425ce..c87989df5 100644 --- a/test/scripts/0000-Basic/0127 +++ b/test/scripts/0000-Basic/0127 @@ -22,6 +22,7 @@ Sender: Sender in original <sender@original.ex> This is a test message. **** exim -bs -odi +helo test mail from:userx@cus.cam.ac.uk rcpt to:userx@test.ex data @@ -58,6 +59,7 @@ From: From person <from@some.where> This is a test message. **** exim -bs -odi +helo test mail from:userx@cus.cam.ac.uk rcpt to:userx@test.ex data diff --git a/test/scripts/0000-Basic/0130 b/test/scripts/0000-Basic/0130 index 11f0fb717..13eb7c2cb 100644 --- a/test/scripts/0000-Basic/0130 +++ b/test/scripts/0000-Basic/0130 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh V4NET.0.0.0 +helo test mail from:<userx@test.ex> rcpt to:<userx@not.test.ex> quit diff --git a/test/scripts/0000-Basic/0136 b/test/scripts/0000-Basic/0136 index 61afd6df6..ebe4ded30 100644 --- a/test/scripts/0000-Basic/0136 +++ b/test/scripts/0000-Basic/0136 @@ -1,5 +1,6 @@ # errors_to in user filters and bounce_return_body exim -odi -bs +helo test mail from:<abcd@x.y.z> rcpt to:<forwarder@test.ex> rcpt to:<forwarder2@test.ex> @@ -9,6 +10,7 @@ Test message. quit **** exim -DBRB=false -odi -bs +helo test mail from:<abcd@x.y.z> rcpt to:<forwarder@test.ex> rcpt to:<forwarder2@test.ex> diff --git a/test/scripts/0000-Basic/0145 b/test/scripts/0000-Basic/0145 index 44a37c329..1c624ab42 100644 --- a/test/scripts/0000-Basic/0145 +++ b/test/scripts/0000-Basic/0145 @@ -3,11 +3,13 @@ exim -bt x@mxt10.test.ex **** exim -bh V4NET.9.8.7 +helo test mail from:<x@mxt10.test.ex> rcpt to:<x@y> quit **** exim -bh V4NET.9.8.7 +helo test mail from:<x@ten-1.test.ex> rcpt to:<x@mxt10.test.ex> quit diff --git a/test/scripts/0000-Basic/0157 b/test/scripts/0000-Basic/0157 index 03d397893..291cb444b 100644 --- a/test/scripts/0000-Basic/0157 +++ b/test/scripts/0000-Basic/0157 @@ -1,5 +1,6 @@ # relay by sender and host exim -bh V4NET.0.0.1 +helo test mail from:<x@y.z> rcpt to:<a@b.c> rset @@ -8,6 +9,7 @@ rcpt to:<a@b.c> quit **** exim -bh V4NET.0.0.2 +helo test mail from:<x@y.z> rcpt to:<a@b.c> rset @@ -16,6 +18,7 @@ rcpt to:<a@b.c> quit **** exim -bh V4NET.0.0.3 +helo test mail from:<x@y.z> rcpt to:<a@b.c> rset diff --git a/test/scripts/0000-Basic/0162 b/test/scripts/0000-Basic/0162 index 6b24b20bb..f9f169cbe 100644 --- a/test/scripts/0000-Basic/0162 +++ b/test/scripts/0000-Basic/0162 @@ -1,5 +1,6 @@ # failing header with very long apparent address exim -odq -bs +helo test mail from:<u2@test.ex> rcpt to:<u3@test.ex> data diff --git a/test/scripts/0000-Basic/0175 b/test/scripts/0000-Basic/0175 index ef4098586..a1ffcc60b 100644 --- a/test/scripts/0000-Basic/0175 +++ b/test/scripts/0000-Basic/0175 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh V4NET.0.0.0 +helo test mail from:<user@bad.domain> rcpt to:<userx@test.ex> data @@ -9,6 +10,7 @@ data quit **** exim -bh V4NET.0.0.0 +helo test mail from:<user@bad.domain2> rcpt to:<userx@test.ex> data @@ -16,6 +18,7 @@ data quit **** exim -bh V4NET.0.0.0 +helo test mail from:<user@ten-1.test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0197 b/test/scripts/0000-Basic/0197 index dc6bb520e..717b5da50 100644 --- a/test/scripts/0000-Basic/0197 +++ b/test/scripts/0000-Basic/0197 @@ -6,6 +6,7 @@ Test one. . **** exim -odi -bs +helo test mail from:<doesn't@matter> rcpt to:<x@copy.domain> rcpt to:<y@copy.domain> diff --git a/test/scripts/0000-Basic/0202 b/test/scripts/0000-Basic/0202 index 0bba061e7..04d3f2006 100644 --- a/test/scripts/0000-Basic/0202 +++ b/test/scripts/0000-Basic/0202 @@ -1,5 +1,6 @@ # .. in header lines (SMTP and otherwise) exim -bs +HELO test MAIL FROM:<userx@test.ex> RCPT TO:<userx@test.ex> DATA @@ -11,6 +12,7 @@ This line follows .. quit **** exim -bs +HELO test MAIL FROM:<userx@test.ex> RCPT TO:<userx@test.ex> DATA diff --git a/test/scripts/0000-Basic/0212 b/test/scripts/0000-Basic/0212 index 29a8d25aa..b21177ae9 100644 --- a/test/scripts/0000-Basic/0212 +++ b/test/scripts/0000-Basic/0212 @@ -14,6 +14,7 @@ file "smartuser.b@test.ex,a@test.ex"@test.ex **** exim -bs -oMa V4NET.0.0.0 +helo test mail from:<userx@test.ex> rcpt to:<a@test.ex> rcpt to:<b@test.ex> diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214 index 7a58a624c..fb282780e 100644 --- a/test/scripts/0000-Basic/0214 +++ b/test/scripts/0000-Basic/0214 @@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D **** client 127.0.0.1 PORT_D ??? 220 +helo test +??? 250 mail from:<x@y.x> ??? 250 rcpt to:<x@test.ex> diff --git a/test/scripts/0000-Basic/0220 b/test/scripts/0000-Basic/0220 index 2ac40c98d..b1e81918d 100644 --- a/test/scripts/0000-Basic/0220 +++ b/test/scripts/0000-Basic/0220 @@ -5,6 +5,7 @@ exim -odi userx From foo@bar Fri Jan 5 12:35 GMT 1996 **** exim -odi -bs +HELO test MAIL FROM:<foo@bar> RCPT TO:<userx@test.ex> DATA diff --git a/test/scripts/0000-Basic/0221 b/test/scripts/0000-Basic/0221 index d08fc4abd..2d4c51978 100644 --- a/test/scripts/0000-Basic/0221 +++ b/test/scripts/0000-Basic/0221 @@ -5,6 +5,7 @@ exim -odi userx From foo@bar Fri Jan 5 12:35 GMT 1996 **** exim -odi -bs +HELO test MAIL FROM:<foo@bar> RCPT TO:<userx@test.ex> DATA diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227 index ac7bcb05c..e7b6d1ee9 100644 --- a/test/scripts/0000-Basic/0227 +++ b/test/scripts/0000-Basic/0227 @@ -14,12 +14,14 @@ QUIT **** # sender sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT **** # sender, no callout sudo exim -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<unchecked@localhost> RCPT TO:<z@test.ex> QUIT @@ -37,6 +39,7 @@ QUIT **** # sender, refused sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost> RCPT TO:<z@test.ex> QUIT @@ -54,6 +57,7 @@ QUIT **** # sender, tmperr sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@test.ex> QUIT @@ -69,6 +73,7 @@ QUIT **** # sender, err on mailfrom sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<uncheckable2@localhost1> RCPT TO:<z@test.ex> QUIT @@ -85,6 +90,7 @@ QUIT **** # sender, multiline err on mailfrom sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@test.ex> QUIT @@ -100,6 +106,7 @@ QUIT **** # sender, err on mailfrom, with bad char sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<uncheckable2@localhost1> RCPT TO:<z@test.ex> QUIT @@ -117,6 +124,7 @@ QUIT **** # recipient, refused sudo exim -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.domain> QUIT @@ -135,6 +143,7 @@ QUIT **** # recipient, refused sudo exim -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.domain> QUIT @@ -152,12 +161,14 @@ QUIT **** # recipient, refused, badchar in resp sudo exim -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.domain> QUIT **** # recipient, no conneect sudo exim -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.domain> QUIT @@ -174,6 +185,7 @@ QUIT 250 OK **** sudo exim -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.domain> DATA @@ -193,6 +205,7 @@ QUIT 250 OK **** sudo exim -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.domain> DATA @@ -218,6 +231,7 @@ QUIT 250 OK **** sudo exim -v -bs -oMa V4NET.0.0.5 +HELO test MAIL FROM:<ok@localhost1> RCPT TO:<z@remote.domain> QUIT @@ -240,6 +254,7 @@ QUIT 250 OK **** sudo exim -v -bs -oMa V4NET.0.0.5 +HELO test MAIL FROM:<ok@localhost1> RCPT TO:<z@remote.domain> QUIT @@ -348,6 +363,7 @@ QUIT 250 OK **** sudo exim -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<uncheckable@localhost1> RCPT TO:<z@remote.lmtp> QUIT @@ -355,11 +371,13 @@ QUIT server PORT_S **** sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost1> RCPT TO:<z@test.ex> QUIT **** sudo exim -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost1> RCPT TO:<z@test.ex> QUIT diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230 index 92ef10c51..11df58621 100644 --- a/test/scripts/0000-Basic/0230 +++ b/test/scripts/0000-Basic/0230 @@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D **** client HOSTIPV4 PORT_D ??? 220 +helo test +??? 250 mail from:<x@y.x> ??? 250 rcpt to:<x@test.ex> @@ -19,6 +21,8 @@ quit **** client 127.0.0.1 PORT_D ??? 220 +helo test +??? 250 mail from:<x@y.x> ??? 250 rcpt to:<x@test.ex> @@ -48,6 +52,7 @@ quit **** killdaemon sudo exim -bs -oMa V4NET.9.8.7.1234 +helo test mail from:<x@y.x> rcpt to:<x@test.ex> data @@ -68,6 +73,7 @@ quit exim -DSERVER=server -bd -oX PORT_D **** sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225 +helo test mail from:<x@y.x> rcpt to:<x@test.ex> data diff --git a/test/scripts/0000-Basic/0233 b/test/scripts/0000-Basic/0233 index 13726815c..bda2e689a 100644 --- a/test/scripts/0000-Basic/0233 +++ b/test/scripts/0000-Basic/0233 @@ -5,6 +5,7 @@ Rhubarb **** # ACL freezes these two, tell for the second, and third, not for the first exim -odi -bs +helo test mail from:<a@test.ex> rcpt to:<userz@test.ex> data diff --git a/test/scripts/0000-Basic/0234 b/test/scripts/0000-Basic/0234 index 41eaafa72..018421333 100644 --- a/test/scripts/0000-Basic/0234 +++ b/test/scripts/0000-Basic/0234 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh V4NET.0.0.0 +helo test mail from:<a@b> rcpt to:<c@d> rcpt to:<e@mxt1.test.ex> @@ -9,6 +10,7 @@ rcpt to:<f@mxt6.test.ex> quit **** sudo exim -bs -oMa V4NET.0.0.0 +helo test mail from:<a@b> rcpt to:<c@d> rcpt to:<e@mxt1.test.ex> diff --git a/test/scripts/0000-Basic/0251 b/test/scripts/0000-Basic/0251 index 457154389..dad25e39a 100644 --- a/test/scripts/0000-Basic/0251 +++ b/test/scripts/0000-Basic/0251 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh V4NET.0.0.0 +helo test mail from:<ok@sender> rcpt to:<oklist@listr.test.ex> rset @@ -13,6 +14,8 @@ exim -DSERVER=server -bd -oX PORT_D **** client HOSTIPV4 PORT_D ??? 220 +helo test +??? 250 mail from:<ok@sender> ??? 250 rcpt to:<oklist@listr.test.ex> diff --git a/test/scripts/0000-Basic/0256 b/test/scripts/0000-Basic/0256 index bdab73b33..b29dabf26 100644 --- a/test/scripts/0000-Basic/0256 +++ b/test/scripts/0000-Basic/0256 @@ -3,6 +3,7 @@ exim -odi unknown . **** exim -odi -bs +helo test mail from:<"abc@def"@unknown.domain> rcpt to:<unknown@test.ex> data diff --git a/test/scripts/0000-Basic/0281 b/test/scripts/0000-Basic/0281 index ae5624792..f8de7f7f5 100644 --- a/test/scripts/0000-Basic/0281 +++ b/test/scripts/0000-Basic/0281 @@ -1,5 +1,6 @@ # @ items in domain lists and host lists exim -bh V4NET.1.1.1 +helo test mail from:<x@y> rcpt to:<1@myhost.test.ex> rcpt to:<1@[127.0.0.1]> @@ -21,16 +22,19 @@ rcpt to:<5@myhost.test.ex> quit **** exim -bh V4NET.10.10.10 +helo test mail from:<x@y> rcpt to:<5@myhost.test.ex> quit **** exim -bh 127.0.0.1 +helo test mail from:<x@y> rcpt to:<5@myhost.test.ex> quit **** exim -bh V4NET.1.1.1 +helo test mail from:<x@y> rcpt to:<2@mxt3.test.ex> rcpt to:<3@mxt3.test.ex> diff --git a/test/scripts/0000-Basic/0293 b/test/scripts/0000-Basic/0293 index 159353530..2e50aad83 100644 --- a/test/scripts/0000-Basic/0293 +++ b/test/scripts/0000-Basic/0293 @@ -1,17 +1,19 @@ # smtp_accept_{max,queue}_per_connection exim -odi -v -bs -mail from:<x@y> +helo test +mail from:<x1@y> rcpt to:<one@z> data . -mail from:<x@y> +mail from:<x2@y> rcpt to:<two@z> data . -mail from:<x@y> +mail from:<x3@y> quit **** exim -odi -v -bs +helo test mail from:<x@y> rset mail from:<x@y> diff --git a/test/scripts/0000-Basic/0294 b/test/scripts/0000-Basic/0294 index bbb595ddd..62f8ae209 100644 --- a/test/scripts/0000-Basic/0294 +++ b/test/scripts/0000-Basic/0294 @@ -1,5 +1,6 @@ # SMTP rate limiting using smtp_ratelimit_xxx settings exim -d-all+receive -odq -bs +helo test mail from:<x@y> rcpt to:<one@z> rcpt to:<one@z> @@ -16,18 +17,21 @@ mail from:<x@y> quit **** exim -d-all+receive -bh 1.2.3.4 +helo test mail from:<x@y> rcpt to:<one@z> rcpt to:<one@z> quit **** exim -d-all+receive -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<one@z> rcpt to:<one@z> quit **** exim -d-all+receive -odq -bs +helo test mail from:<x@y> rcpt to:<reject@z> rcpt to:<reject@z> diff --git a/test/scripts/0000-Basic/0304 b/test/scripts/0000-Basic/0304 index 8b1c39d0f..3de690733 100644 --- a/test/scripts/0000-Basic/0304 +++ b/test/scripts/0000-Basic/0304 @@ -1,5 +1,6 @@ # address lists exim -bh 1.2.3.4 +helo test mail from:<> rcpt to:<b1@x> rcpt to:<b2@x> diff --git a/test/scripts/0000-Basic/0305 b/test/scripts/0000-Basic/0305 index e6b752363..191470cfc 100644 --- a/test/scripts/0000-Basic/0305 +++ b/test/scripts/0000-Basic/0305 @@ -1,5 +1,6 @@ # expansion in domain lists exim -bh V4NET.2.3.4 +helo test mail from:<x@y> rcpt to:<x@ten-1.test.ex> rcpt to:<x@junk.junk> diff --git a/test/scripts/0000-Basic/0306 b/test/scripts/0000-Basic/0306 index 8a2dc9110..9aeb02b60 100644 --- a/test/scripts/0000-Basic/0306 +++ b/test/scripts/0000-Basic/0306 @@ -8,6 +8,7 @@ exim -odi -f anyone@anywhere list1@lists.test.ex exim -odi -f anyone@anywhere nonlist@lists.test.ex **** exim -bh 1.2.3.4 +helo test mail from:<anyone@anywhere> rcpt to:<list1-request@lists.test.ex> rset diff --git a/test/scripts/0000-Basic/0308 b/test/scripts/0000-Basic/0308 index 39b9ba259..4e0a20408 100644 --- a/test/scripts/0000-Basic/0308 +++ b/test/scripts/0000-Basic/0308 @@ -1,10 +1,12 @@ # host lists and unknown host names - maximal checking exim -bh V4NET.0.0.97 +helo test mail from:<x@y> rcpt to:<z@z> quit **** exim -bh V4NET.0.0.1 +helo test mail from:<x@y> rcpt to:<z@z> quit diff --git a/test/scripts/0000-Basic/0312 b/test/scripts/0000-Basic/0312 index 19cab2c0a..757aab226 100644 --- a/test/scripts/0000-Basic/0312 +++ b/test/scripts/0000-Basic/0312 @@ -1,5 +1,6 @@ # RBL timeout logging exim -bh V4NET.0.0.1 +helo test mail from:<userx@x> rcpt to:<userx@y> quit diff --git a/test/scripts/0000-Basic/0320 b/test/scripts/0000-Basic/0320 index c031567ef..0da983742 100644 --- a/test/scripts/0000-Basic/0320 +++ b/test/scripts/0000-Basic/0320 @@ -1,5 +1,6 @@ # comments and +caseful in local part lists exim -odq -bs +helo test mail from:<x@y> rcpt to:<lp1@z> rcpt to:<LP1@z> diff --git a/test/scripts/0000-Basic/0325 b/test/scripts/0000-Basic/0325 index a81abd6bc..76577f523 100644 --- a/test/scripts/0000-Basic/0325 +++ b/test/scripts/0000-Basic/0325 @@ -2,6 +2,7 @@ exim -v -bt xxx@a.b.c **** exim -bh V4NET.0.0.0 +helo test mail from:a@b.c rcpt to:xxx@a.b.c quit diff --git a/test/scripts/0000-Basic/0340 b/test/scripts/0000-Basic/0340 index a4ee6ad66..c6e36cea4 100644 --- a/test/scripts/0000-Basic/0340 +++ b/test/scripts/0000-Basic/0340 @@ -1,5 +1,6 @@ # dnslist when no host address exim -bs +helo test mail from:<userx@test.ex> rcpt to:<userx@test.again.dns> quit diff --git a/test/scripts/0000-Basic/0342 b/test/scripts/0000-Basic/0342 index 0b4016293..e3332e78e 100644 --- a/test/scripts/0000-Basic/0342 +++ b/test/scripts/0000-Basic/0342 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh 1.2.3.4 +helo test mail from:<x@y> rcpt to:<x@ten-1> quit diff --git a/test/scripts/0000-Basic/0362 b/test/scripts/0000-Basic/0362 index 60d5155e3..904e4c936 100644 --- a/test/scripts/0000-Basic/0362 +++ b/test/scripts/0000-Basic/0362 @@ -2,6 +2,7 @@ need_ipv4 # exim -d -bh V4NET.0.0.0 +helo test mail from:<x@y> rcpt to:<x@a.b.c> quit diff --git a/test/scripts/0000-Basic/0365 b/test/scripts/0000-Basic/0365 index 0697f1e0d..81cef224a 100644 --- a/test/scripts/0000-Basic/0365 +++ b/test/scripts/0000-Basic/0365 @@ -2,6 +2,7 @@ need_ipv4 # exim -bs +helo test mail from:<> rcpt to:<x@y> data @@ -37,6 +38,7 @@ rset quit **** exim -DDETAILS=true -DSELECTOR=-rejected_header -bs +helo test mail from:<> rcpt to:<x@y> data diff --git a/test/scripts/0000-Basic/0372 b/test/scripts/0000-Basic/0372 index 1bd39c758..4c77759cd 100644 --- a/test/scripts/0000-Basic/0372 +++ b/test/scripts/0000-Basic/0372 @@ -1,5 +1,6 @@ # Preservation of ACL variables exim -v -odi -bs -oMa 1.2.3.4 -oMs host.name +helo test mail from:<> rcpt to:<x@y> data @@ -11,6 +12,7 @@ data quit **** exim -DSTRICT=strict_acl_vars -odi -bs -oMa 4.3.2.1 -oMs host2.name +helo test mail from:<> rcpt to:<a@b> data diff --git a/test/scripts/0000-Basic/0376 b/test/scripts/0000-Basic/0376 index 88eec49f5..d6107e046 100644 --- a/test/scripts/0000-Basic/0376 +++ b/test/scripts/0000-Basic/0376 @@ -13,11 +13,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT @@ -26,6 +28,7 @@ QUIT sleep 2 # Should want to connect, but fail sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT @@ -43,11 +46,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost> RCPT TO:<z@test.ex> QUIT @@ -63,11 +68,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT @@ -91,11 +98,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost> RCPT TO:<z@test.ex> QUIT @@ -119,11 +128,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost2> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost2> RCPT TO:<z@test.ex> QUIT @@ -141,11 +152,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<ok@otherhost3> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<otherok@otherhost3> RCPT TO:<z@test.ex> QUIT @@ -163,11 +176,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost4> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost4> RCPT TO:<z@test.ex> QUIT @@ -197,11 +212,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost41> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost41> RCPT TO:<z@test.ex> QUIT @@ -226,6 +243,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost21> RCPT TO:<z@test.ex> QUIT @@ -242,6 +260,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok2@otherhost21> RCPT TO:<z@test.ex> QUIT @@ -265,6 +284,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<ok@otherhost31> RCPT TO:<z@test.ex> QUIT @@ -281,6 +301,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<okok@otherhost31> RCPT TO:<z@test.ex> QUIT @@ -305,6 +326,7 @@ QUIT 250 OK **** sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<okokok@otherhost31> RCPT TO:<z@test.ex> QUIT @@ -320,6 +342,7 @@ RCPT TO *sleep 2 **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5 +HELO test MAIL FROM:<okok@otherhost51> RCPT TO:<z@test.ex> QUIT @@ -343,6 +366,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6 +HELO test MAIL FROM:<okokok@otherhost52> RCPT TO:<z@test.ex> QUIT @@ -360,6 +384,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7 +HELO test MAIL FROM:<ok7@otherhost53> RCPT TO:<z@test.ex> DATA @@ -378,6 +403,7 @@ RCPT TO *sleep 2 **** sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8 +HELO test MAIL FROM:<ok7@otherhost53> RCPT TO:<z@test.ex> DATA @@ -406,6 +432,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9 +HELO test MAIL FROM:<ok@otherhost9> RCPT TO:<z@test.ex> QUIT @@ -435,6 +462,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10 +HELO test MAIL FROM:<ok@otherhost10> RCPT TO:<z@test.ex> QUIT diff --git a/test/scripts/0000-Basic/0381 b/test/scripts/0000-Basic/0381 index 738b0661d..28dfbcdfa 100644 --- a/test/scripts/0000-Basic/0381 +++ b/test/scripts/0000-Basic/0381 @@ -1,6 +1,7 @@ # negatives with wildcard hosts when host has multiple names munge dnssec exim -d -bs -oMa V4NET.99.99.97 +helo test mail from:<notgov@test.ex> rcpt to:<x@test.ex> quit diff --git a/test/scripts/0000-Basic/0386 b/test/scripts/0000-Basic/0386 index 7adc4fbeb..6c342637b 100644 --- a/test/scripts/0000-Basic/0386 +++ b/test/scripts/0000-Basic/0386 @@ -1,5 +1,6 @@ # ACLs and multiple messages exim -d -bh V4NET.9.8.7 +helo test mail from:<x@y> rcpt to:<1@b> rset @@ -8,6 +9,7 @@ rcpt to:<1@b> quit **** exim -d -odi -bs -oMa V4NET.11.12.13 userx +helo test mail from:<x@y> rcpt to:<2@b> data diff --git a/test/scripts/0000-Basic/0387 b/test/scripts/0000-Basic/0387 index 155ad0235..24cb0eda7 100644 --- a/test/scripts/0000-Basic/0387 +++ b/test/scripts/0000-Basic/0387 @@ -1,5 +1,6 @@ # Partial matching and lookup name decoding exim -bs +helo test mail from:<x@a.b.c> rcpt to:<x@y> rset @@ -8,16 +9,19 @@ rcpt to:<x@y> quit **** exim -bs -oMa 10.9.8.7 +helo test mail from:<x@b.c.a> rcpt to:<x@y> quit **** exim -bs -oMa 192.168.4.5 +helo test mail from:<x@b.c.a> rcpt to:<x@y> quit **** exim -bs -oMa 1.2.3.4 +helo test mail from:<x@b.c.a> rcpt to:<x@y> quit diff --git a/test/scripts/0000-Basic/0389 b/test/scripts/0000-Basic/0389 index d23af20c3..85855d6ff 100644 --- a/test/scripts/0000-Basic/0389 +++ b/test/scripts/0000-Basic/0389 @@ -1,5 +1,6 @@ # warn with log_message but no message exim -bs +helo test mail from:x@y rcpt to:x@y data diff --git a/test/scripts/0000-Basic/0391 b/test/scripts/0000-Basic/0391 index bbb0fb577..5d459eb9d 100644 --- a/test/scripts/0000-Basic/0391 +++ b/test/scripts/0000-Basic/0391 @@ -1,5 +1,6 @@ # Sender verify rewrite and $sender_address exim -d -bh 1.2.3.4 +helo test mail from:<U@W.x.y> rcpt to:<B@a.b.c> quit diff --git a/test/scripts/0000-Basic/0395 b/test/scripts/0000-Basic/0395 index 01afebdf4..51dc6ba50 100644 --- a/test/scripts/0000-Basic/0395 +++ b/test/scripts/0000-Basic/0395 @@ -23,6 +23,7 @@ To: userx # Same tests for BSMTP 2 exim -odi -bnq -bS +helo test mail from: userx rcpt to: userx data @@ -33,6 +34,7 @@ quit **** 2 exim -odi -bnq -bS +helo test mail from: userx@origin.ex rcpt to: userx data @@ -42,6 +44,7 @@ To: userx quit **** exim -odi -bnq -bS +helo test mail from: userx@origin.ex rcpt to: userx@test.ex data @@ -51,6 +54,7 @@ To: userx quit **** exim -odi -bS +helo test mail from: userx@origin.ex rcpt to: userx@test.ex data @@ -60,6 +64,7 @@ To: userx quit **** exim -odi -bnq -bs +helo test mail from: userx@origin.ex rcpt to: userx data @@ -69,6 +74,7 @@ To: userx quit **** exim -odi -bnq -bs +helo test mail from: userx@origin.ex rcpt to: userx@test.ex data @@ -78,6 +84,7 @@ To: userx quit **** exim -odi -bs +helo test mail from: userx@origin.ex rcpt to: userx@test.ex data diff --git a/test/scripts/0000-Basic/0396 b/test/scripts/0000-Basic/0396 index 356021a24..da9afcec4 100644 --- a/test/scripts/0000-Basic/0396 +++ b/test/scripts/0000-Basic/0396 @@ -1,5 +1,6 @@ # forced failure in named list exim -d -bs +helo test mail from:<x@y> rcpt to:<x@y> quit diff --git a/test/scripts/0000-Basic/0398 b/test/scripts/0000-Basic/0398 index 3465e26d6..023515d30 100644 --- a/test/scripts/0000-Basic/0398 +++ b/test/scripts/0000-Basic/0398 @@ -13,6 +13,7 @@ QUIT 250 OK **** exim -odi -bs +helo test mail from:<x@remote> rcpt to:<x@local> data @@ -32,6 +33,7 @@ QUIT 250 OK **** exim -odi -bs +helo test mail from:<z@remote> rcpt to:<deny@local> quit @@ -48,12 +50,14 @@ QUIT 250 OK **** exim -d -odi -bs +helo test mail from:<qq@remote> rcpt to:<abc@local> rcpt to:<xyz@local> quit **** exim -odi -bs +helo test mail from:<> rcpt to:<abc@local> rcpt to:<xyz@local> diff --git a/test/scripts/0000-Basic/0407 b/test/scripts/0000-Basic/0407 index 0d8e7ca37..1fecef5e2 100644 --- a/test/scripts/0000-Basic/0407 +++ b/test/scripts/0000-Basic/0407 @@ -15,6 +15,7 @@ exim -DHEADER_MAXSIZE=header_maxsize=2M x@y <DIR/test-data exim -DHEADER_MAXSIZE=header_maxsize=2M -DHEADER_LINE_MAXSIZE=header_line_maxsize=1024 x@y <DIR/test-data **** exim -DHEADER_LINE_MAXSIZE=header_line_maxsize=20 -bs +helo test mail from:<x@y> rcpt to:<x@y> data diff --git a/test/scripts/0000-Basic/0410 b/test/scripts/0000-Basic/0410 index 8d9c240ee..1b3cf0f9a 100644 --- a/test/scripts/0000-Basic/0410 +++ b/test/scripts/0000-Basic/0410 @@ -1,5 +1,6 @@ # address_data and router_name in ACLs after verification exim -bs +helo test MAIL FROM:<oksender@y> rcpt to:<child@test.ex> rcpt to:<orig@test.ex> diff --git a/test/scripts/0000-Basic/0413 b/test/scripts/0000-Basic/0413 index eb805808e..d72a32bd7 100644 --- a/test/scripts/0000-Basic/0413 +++ b/test/scripts/0000-Basic/0413 @@ -33,6 +33,7 @@ QUIT 250 OK **** exim -odi -bs +helo test mail from:<r1@domain1> rset mail from:<r2@domain2> diff --git a/test/scripts/0000-Basic/0417 b/test/scripts/0000-Basic/0417 index ac3da7d32..70d9b805a 100644 --- a/test/scripts/0000-Basic/0417 +++ b/test/scripts/0000-Basic/0417 @@ -2,12 +2,14 @@ need_ipv4 # exim -bs +helo test mail from:<x@host.test.again.dns> rcpt to:<x@y> rcpt to:<a@b> quit **** exim -DRETURN_ERROR_DETAILS=true -bs +helo test mail from:<x@host.test.again.dns> rcpt to:<x@y> rcpt to:<a@b> diff --git a/test/scripts/0000-Basic/0418 b/test/scripts/0000-Basic/0418 index 147ae559a..4a9e26047 100644 --- a/test/scripts/0000-Basic/0418 +++ b/test/scripts/0000-Basic/0418 @@ -1,5 +1,6 @@ # Continuations in file ACL exim -odq -bs +helo test mail from:<> rcpt to:<x@y> quit diff --git a/test/scripts/0000-Basic/0425 b/test/scripts/0000-Basic/0425 index 725900a2f..396921508 100644 --- a/test/scripts/0000-Basic/0425 +++ b/test/scripts/0000-Basic/0425 @@ -2,6 +2,7 @@ need_ipv4 # exim -bs +helo test mail from:<BAD@y> rcpt to:<OK@x> rcpt to:<BAD@x> diff --git a/test/scripts/0000-Basic/0432 b/test/scripts/0000-Basic/0432 index e83626ca3..c4a2330b1 100644 --- a/test/scripts/0000-Basic/0432 +++ b/test/scripts/0000-Basic/0432 @@ -2,6 +2,7 @@ need_ipv4 # exim -bh 1.2.3.4 +helo test mail from:<x@y> quit **** @@ -17,14 +18,17 @@ QUIT 220 OK **** exim -d -bhc 1.2.3.4 +helo test mail from:<x@y> quit **** exim -d -bhc 1.2.3.4 +helo test mail from:<x@y> quit **** exim -bhc 1.2.3.4 +helo test mail from:<x@y> quit **** @@ -40,6 +44,7 @@ QUIT 220 OK **** exim -bhc 1.2.3.4 +helo test mail from:<a@b> quit **** @@ -51,6 +56,7 @@ EHLO *eof **** exim -bhc 1.2.3.4 +helo test mail from:<p1@q> quit **** diff --git a/test/scripts/0000-Basic/0443 b/test/scripts/0000-Basic/0443 index 8e3b03779..bc39dab19 100644 --- a/test/scripts/0000-Basic/0443 +++ b/test/scripts/0000-Basic/0443 @@ -1,5 +1,6 @@ # verify callout with no transport exim -bhc V4NET.0.0.1 +helo test Mail from: x@ten-1.test.ex rcpt to: x@y quit diff --git a/test/scripts/0000-Basic/0445 b/test/scripts/0000-Basic/0445 index fd38f85b5..54bfcc193 100644 --- a/test/scripts/0000-Basic/0445 +++ b/test/scripts/0000-Basic/0445 @@ -1,5 +1,6 @@ # :fail: with looked up empty string exim -bh 1.2.3.4 +helo test mail from:<lp1@x.y> rcpt to:<zz@x.y> rset diff --git a/test/scripts/0000-Basic/0446 b/test/scripts/0000-Basic/0446 index 00e7ec6b9..57451cf58 100644 --- a/test/scripts/0000-Basic/0446 +++ b/test/scripts/0000-Basic/0446 @@ -4,6 +4,7 @@ Received: the first received: line Received: the second received: line **** exim -odi -bs +helo test mail from:<> rcpt to:userx@test.ex data diff --git a/test/scripts/0000-Basic/0453 b/test/scripts/0000-Basic/0453 index b07a7125c..c5445b245 100644 --- a/test/scripts/0000-Basic/0453 +++ b/test/scripts/0000-Basic/0453 @@ -10,6 +10,7 @@ helo **** 1 exim -DERROR_DETAILS=smtp_max_synprot_errors=1 -bs +helo test mail from:<> mail from:<> mail from:<> diff --git a/test/scripts/0000-Basic/0459 b/test/scripts/0000-Basic/0459 index 873c5d87f..feac5cfb4 100644 --- a/test/scripts/0000-Basic/0459 +++ b/test/scripts/0000-Basic/0459 @@ -1,5 +1,6 @@ # unwanted search error messages in ACLs exim -bs +helo test mail from:<> rcpt to:outer@xx quit diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462 index da7b714bf..fa6f38678 100644 --- 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 +HELO test 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 +HELO test 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 +HELO test MAIL FROM:<NOTok2@elsewhere> RCPT TO:<nocheckpm@test.ex> QUIT diff --git a/test/scripts/0000-Basic/0464 b/test/scripts/0000-Basic/0464 index d2e231cac..a81fcf94b 100644 --- a/test/scripts/0000-Basic/0464 +++ b/test/scripts/0000-Basic/0464 @@ -2,6 +2,7 @@ need_ipv4 # exim -d -bs +helo test mail from:<> rcpt to:<abc@domain1> quit diff --git a/test/scripts/0000-Basic/0465 b/test/scripts/0000-Basic/0465 index de8b6cbdf..3b2e54c6b 100644 --- a/test/scripts/0000-Basic/0465 +++ b/test/scripts/0000-Basic/0465 @@ -1,5 +1,6 @@ # strip_trailing_dot exim -d -bs +helo test mail from:<> rcpt to:<abc@domain.> quit @@ -8,6 +9,7 @@ quit exim -f abc@somewhere. xxx **** exim -DOPT=strip_trailing_dot -d -bs +helo test mail from:<> rcpt to:<abc@domain.> data @@ -18,6 +20,7 @@ quit exim -DOPT=strip_trailing_dot -f abc@somewhere. xxx@yyy. **** exim -d -bs +helo test mail from:<> rcpt to:<abc@xyz> data diff --git a/test/scripts/0000-Basic/0468 b/test/scripts/0000-Basic/0468 index 7c0790526..c30503c1b 100644 --- a/test/scripts/0000-Basic/0468 +++ b/test/scripts/0000-Basic/0468 @@ -1,5 +1,6 @@ # $message_body in multiple SMTP messages exim -bs +helo test mail from:<> rcpt to:<x@y> data diff --git a/test/scripts/0000-Basic/0475 b/test/scripts/0000-Basic/0475 index 1571f4e89..5008c8768 100644 --- a/test/scripts/0000-Basic/0475 +++ b/test/scripts/0000-Basic/0475 @@ -1,5 +1,6 @@ # malformed item in host list exim -bh V4NET.0.0.0 +helo test mail from:<> rcpt to:<a1@b> rcpt to:<a2@b> diff --git a/test/scripts/0000-Basic/0483 b/test/scripts/0000-Basic/0483 index 14e42e3b9..23a8a58d3 100644 --- a/test/scripts/0000-Basic/0483 +++ b/test/scripts/0000-Basic/0483 @@ -1,5 +1,6 @@ # $sender_data and $recipient_data exim -bs -d-all+route +helo test mail from:<sender@domain1> rcpt to:<recip@domain2> rcpt to:<other@domain2> diff --git a/test/scripts/0000-Basic/0488 b/test/scripts/0000-Basic/0488 index e4b96b70a..7baa8840a 100644 --- a/test/scripts/0000-Basic/0488 +++ b/test/scripts/0000-Basic/0488 @@ -1,5 +1,6 @@ # Multiple headers in one warn message exim -odq -bs +HELO test MAIL FROM:<> RCPT TO:<userx@test.ex> DATA diff --git a/test/scripts/0000-Basic/0490 b/test/scripts/0000-Basic/0490 Binary files differindex 060e270b4..28c2de0e9 100644 --- a/test/scripts/0000-Basic/0490 +++ b/test/scripts/0000-Basic/0490 diff --git a/test/scripts/0000-Basic/0496 b/test/scripts/0000-Basic/0496 index ba96dc7dc..7b38ba657 100644 --- a/test/scripts/0000-Basic/0496 +++ b/test/scripts/0000-Basic/0496 @@ -1,5 +1,6 @@ # acl adding positioned headers exim -odi -bs +helo test Mail From:<some@ne> rcpt To: <someone@el.se> data diff --git a/test/scripts/0000-Basic/0500 b/test/scripts/0000-Basic/0500 index 75bffe425..688671625 100644 --- a/test/scripts/0000-Basic/0500 +++ b/test/scripts/0000-Basic/0500 @@ -1,11 +1,13 @@ # predata ACL exim -odi -bs +helo test mail from:<x@y> rcpt to:<userx@y> data quit **** exim -odi -bs +helo test mail from:<postmaster@y> rcpt to:<userx@y> data diff --git a/test/scripts/0000-Basic/0501 b/test/scripts/0000-Basic/0501 index c173255cb..9f9fbdf94 100644 --- a/test/scripts/0000-Basic/0501 +++ b/test/scripts/0000-Basic/0501 @@ -1,5 +1,6 @@ # control = case{ful,less}_local_part exim -odi -bs +helo test mail from:<x@y> rcpt to:<Phil.Hazel@y> quit diff --git a/test/scripts/0000-Basic/0502 b/test/scripts/0000-Basic/0502 index c22205ca7..1c0bc6afc 100644 --- a/test/scripts/0000-Basic/0502 +++ b/test/scripts/0000-Basic/0502 @@ -1,5 +1,6 @@ # ACL for QUIT exim -bs +helo test mail from:<x@y> rcpt to:<a@y> rcpt to:<b@y> @@ -20,6 +21,7 @@ exim -bs -DLAST='deny message = Your message here' quit **** exim -bs -DLAST='' +helo test mail from:<a@b> quit **** diff --git a/test/scripts/0000-Basic/0505 b/test/scripts/0000-Basic/0505 index 7059a93b5..5b73ae4ee 100644 --- a/test/scripts/0000-Basic/0505 +++ b/test/scripts/0000-Basic/0505 @@ -1,5 +1,6 @@ # check illegally placed ACL control modifiers exim -DACL=smtp_data -DCONTROL=submission -bs +helo test mail from:<> rcpt to:<userx@x.y> data @@ -8,6 +9,7 @@ Rhubarb quit **** exim -DACL=smtp_predata -DCONTROL=submission -bs +helo test mail from:<> rcpt to:<userx@x.y> data diff --git a/test/scripts/0000-Basic/0507 b/test/scripts/0000-Basic/0507 index ce8d71e85..86f8a10c8 100644 --- a/test/scripts/0000-Basic/0507 +++ b/test/scripts/0000-Basic/0507 @@ -1,5 +1,6 @@ # verify = not_blind exim -odq -bs +helo test mail from:<> rcpt to:<userx@dom.com> data @@ -8,6 +9,7 @@ To: a@b.c, himself <userx@dom.com> quit **** exim -odq -bs +helo test mail from:<> rcpt to:<userx@dom.com> data @@ -16,6 +18,7 @@ To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com> quit **** exim -DERROR_DETAILS=smtp_return_error_details -odq -bs +helo test mail from:<> rcpt to:<userx@dom.com> data @@ -24,6 +27,7 @@ To: a@b.c, himself <usery@dom.com> quit **** exim -odq -bs +helo test mail from:<> rcpt to:<userx@dom.com> rcpt to:<usery@dom.com> @@ -34,6 +38,7 @@ Cc: unqualified, userx@dom.com, x@y.z quit **** exim -odq -bs +helo test mail from:<> rcpt to:<userx@dom.com> rcpt to:<usery@dom.com> @@ -45,6 +50,7 @@ Cc: unqualified, userx@dom.com, x@y.z quit **** exim -odq -bs +helo test mail from:<> rcpt to:<userx@dom.com> rcpt to:<usery@dom.com> diff --git a/test/scripts/0000-Basic/0517 b/test/scripts/0000-Basic/0517 index 44e0c7633..629d5efcf 100644 --- a/test/scripts/0000-Basic/0517 +++ b/test/scripts/0000-Basic/0517 @@ -1,5 +1,6 @@ # control = suppress_local_fixups exim -odi -bs +helo test mail from:<> rcpt to:<userx@dom.com> data @@ -7,6 +8,7 @@ data quit **** exim -odi -bs +helo test mail from:<> rcpt to:<usery@dom.com> data diff --git a/test/scripts/0000-Basic/0518 b/test/scripts/0000-Basic/0518 index 6b092173c..6ee234d85 100644 --- a/test/scripts/0000-Basic/0518 +++ b/test/scripts/0000-Basic/0518 @@ -83,6 +83,7 @@ QUIT 250 OK **** exim -odq -bs +helo test mail from:<> RCPT TO:<abc@include> RCPT TO:<abc@exclude> diff --git a/test/scripts/0000-Basic/0525 b/test/scripts/0000-Basic/0525 index 3e5a9ac1c..ad9a35853 100644 --- a/test/scripts/0000-Basic/0525 +++ b/test/scripts/0000-Basic/0525 @@ -14,6 +14,7 @@ DATA *sleep 3 **** write test-data 200000x80 +helo test mail from:<abc@xyz> RCPT TO:<def@pqr> DATA diff --git a/test/scripts/0000-Basic/0527 b/test/scripts/0000-Basic/0527 index 9c880d644..5c5cf6957 100644 --- a/test/scripts/0000-Basic/0527 +++ b/test/scripts/0000-Basic/0527 @@ -2,6 +2,7 @@ need_ipv4 # exim -bs +helo test mail from:<unknown@x.x.x.x> rcpt to:<unknown@u.u.u.u> quit diff --git a/test/scripts/0000-Basic/0530 b/test/scripts/0000-Basic/0530 index 6c57868ab..093d61efa 100644 --- a/test/scripts/0000-Basic/0530 +++ b/test/scripts/0000-Basic/0530 @@ -33,6 +33,7 @@ In-Reply-To: <i1@b> # an SMTP interface. # exim -odi -bs +helo test mail from:<CALLER@test.ex> rcpt to:<userx@test.ex> data @@ -41,6 +42,7 @@ Subject: no Message-id, no References, no In-Reply-to quit **** exim -odi -bs +helo test mail from:<CALLER@test.ex> rcpt to:<userx@test.ex> data @@ -50,6 +52,7 @@ In-Reply-To: <i1@b> quit **** exim -odi -bs +helo test mail from:<CALLER@test.ex> rcpt to:<userx@test.ex> data @@ -60,6 +63,7 @@ In-Reply-To: <i1@b> quit **** exim -odi -bs +helo test mail from:<CALLER@test.ex> rcpt to:<userx@test.ex> data @@ -69,6 +73,7 @@ References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> quit **** exim -odi -bs +helo test mail from:<CALLER@test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0532 b/test/scripts/0000-Basic/0532 index 80124cec1..23a60e2f6 100644 --- a/test/scripts/0000-Basic/0532 +++ b/test/scripts/0000-Basic/0532 @@ -1,5 +1,6 @@ # add_header modifier in ACLs exim -bs -odi +helo test mail from:<mailok@test.ex> rcpt to:<rcptok@test.ex> rcpt to:<notok@test.ex> diff --git a/test/scripts/0000-Basic/0538 b/test/scripts/0000-Basic/0538 index ccabcfbee..51daa9a26 100644 --- a/test/scripts/0000-Basic/0538 +++ b/test/scripts/0000-Basic/0538 @@ -12,6 +12,7 @@ QUIT 221 Bye **** exim -bs +helo test mail from:<userx@broken.example> quit **** @@ -28,12 +29,14 @@ QUIT 221 Bye **** exim -bs +helo test mail from:<userx@ok.example> rcpt to:<usery@broken.example> quit **** # A final check that the cache works for sender address exim -bs +helo test mail from:<userx@broken.example> quit **** diff --git a/test/scripts/0000-Basic/0539 b/test/scripts/0000-Basic/0539 index 193047aa0..559c633b5 100644 --- a/test/scripts/0000-Basic/0539 +++ b/test/scripts/0000-Basic/0539 @@ -1,5 +1,6 @@ # log_reject_target exim -bs +helo test mail from:<main@test.ex> mail from:<reject@test.ex> mail from:<both@test.ex> diff --git a/test/scripts/0000-Basic/0540 b/test/scripts/0000-Basic/0540 index 0866eefb9..213797895 100644 --- a/test/scripts/0000-Basic/0540 +++ b/test/scripts/0000-Basic/0540 @@ -43,6 +43,7 @@ QUIT 250 OK **** exim -odq -bs +helo test mail from:<> RCPT TO:<abc@yes1> RCPT TO:<def@yes2> diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542 index 1c8c03b5f..8d0384681 100644 --- a/test/scripts/0000-Basic/0542 +++ b/test/scripts/0000-Basic/0542 @@ -18,6 +18,7 @@ TESTING_MACROS=$recipients (TESTING_MACROS) **** exim -bs +helo test mail from:<userz@test.ex> rcpt to:<userx@test.x> rcpt to:<usery@test.ex> diff --git a/test/scripts/0000-Basic/0555 b/test/scripts/0000-Basic/0555 index c35113603..d5aa2e268 100644 --- a/test/scripts/0000-Basic/0555 +++ b/test/scripts/0000-Basic/0555 @@ -1,5 +1,6 @@ # Long response lines for fakedefer/fakereject exim -bs +helo test mail from:<> rcpt to:<userx@test.ex> data @@ -10,6 +11,7 @@ quit exim -bs -DFAKE='fakedefer/This is a rather long customised message that \ should get automatically split up into more than one \ response line.' +helo test mail from:<> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0561 b/test/scripts/0000-Basic/0561 index 1f55f8d43..a7a6df5d2 100644 --- a/test/scripts/0000-Basic/0561 +++ b/test/scripts/0000-Basic/0561 @@ -2,6 +2,7 @@ need_ipv4 # exim -bs +helo test mail from:<> rcpt to:<userx@test.ex> data @@ -28,6 +29,7 @@ sleep 1 killdaemon # exim -bs -DQOLL=false +helo test mail from:<> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0565 b/test/scripts/0000-Basic/0565 index 859623378..9c06c57b5 100644 --- a/test/scripts/0000-Basic/0565 +++ b/test/scripts/0000-Basic/0565 @@ -17,6 +17,7 @@ QUIT 221 bye **** exim -odf -bs +helo test mail from:<postmaster@y> rcpt to:<x@y> data @@ -45,6 +46,7 @@ QUIT 221 bye **** exim -odf -bs +helo test mail from:<postmaster@y> rcpt to:<x@test.ex> data diff --git a/test/scripts/0000-Basic/0567 b/test/scripts/0000-Basic/0567 index 5abd06fd6..a7a43489a 100644 --- a/test/scripts/0000-Basic/0567 +++ b/test/scripts/0000-Basic/0567 @@ -1,5 +1,6 @@ # remove_header modifier in ACLs exim -bs -odi +helo test mail from:<mailok@test.ex> rcpt to:<rcptok@test.ex> rcpt to:<notok@test.ex> diff --git a/test/scripts/0000-Basic/0569 b/test/scripts/0000-Basic/0569 index 41cdb8731..a744590c2 100644 --- a/test/scripts/0000-Basic/0569 +++ b/test/scripts/0000-Basic/0569 @@ -1,6 +1,7 @@ # verify = header_names_ascii # 1. Headers are good, make sure no misfires. exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -24,6 +25,7 @@ QUIT **** # 2. A non-ASCII in header name, uses default rejection message exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -48,6 +50,7 @@ QUIT # 3. A non-ASCII character in header name, different from sets an acl variable # causing custom log message exim -bh V4NET.10.10.10 +helo test mail from:<usery@exim.test.ex> rcpt to:<userx@test.ex> data @@ -71,6 +74,7 @@ QUIT **** # 4. A non-ASCII character in header name, uses default rejection message exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -94,6 +98,7 @@ QUIT **** # 5. Headers are good, Unicode in message body, make sure no misfires. exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data @@ -120,6 +125,7 @@ QUIT # 6. Headers are good, Unicode in a header content *and* message body, # make sure no misfires. exim -bh V4NET.10.10.10 +helo test mail from:<userx@exim.test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0575 b/test/scripts/0000-Basic/0575 index 302b67f4f..9d1e3ed03 100644 --- a/test/scripts/0000-Basic/0575 +++ b/test/scripts/0000-Basic/0575 @@ -1,6 +1,7 @@ # -bh and msglog # no logfiles, says the docs exim -d -bh V4NET.0.0.0 +helo test mail from:<x@y> rcpt to:<x@y> data diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576 index 0f9a8c702..5d6e8fc21 100644 --- a/test/scripts/0000-Basic/0576 +++ b/test/scripts/0000-Basic/0576 @@ -4,6 +4,7 @@ no_msglog_check # exim -bs +HELO test MAIL FROM:<CALLER@myhost.test.ex> RCPT TO: <normal@test.ex> DATA @@ -44,6 +45,7 @@ exim -DSERVER=server -qGlowpri/3s **** sleep 1 exim -bs +HELO test MAIL FROM:<CALLER@myhost.test.ex> RCPT TO: <lowpri@test.ex> DATA @@ -58,6 +60,7 @@ killdaemon # # third-party queue transfer exim -bs +HELO test MAIL FROM:<CALLER@myhost.test.ex> RCPT TO: <alternate@test.ex> DATA @@ -76,6 +79,7 @@ exim -q # Native queue transfer ### load messages exim -bs +HELO test MAIL FROM:<CALLER@myhost.test.ex> RCPT TO: <normal@test.ex> DATA diff --git a/test/scripts/0000-Basic/0578 b/test/scripts/0000-Basic/0578 index 4267b0cea..5660a5349 100644 --- a/test/scripts/0000-Basic/0578 +++ b/test/scripts/0000-Basic/0578 @@ -16,11 +16,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT @@ -29,6 +31,7 @@ QUIT sleep 2 # Should want to connect, but fail sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT @@ -48,11 +51,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<bad@localhost> RCPT TO:<z@test.ex> QUIT @@ -72,11 +77,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1 +HELO test MAIL FROM:<ok@localhost> RCPT TO:<z@test.ex> QUIT @@ -102,11 +109,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost> RCPT TO:<z@test.ex> QUIT @@ -132,11 +141,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost2> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost2> RCPT TO:<z@test.ex> QUIT @@ -156,11 +167,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<ok@otherhost3> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<otherok@otherhost3> RCPT TO:<z@test.ex> QUIT @@ -180,11 +193,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost4> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost4> RCPT TO:<z@test.ex> QUIT @@ -216,11 +231,13 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost41> RCPT TO:<z@test.ex> QUIT **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4 +HELO test MAIL FROM:<ok@otherhost41> RCPT TO:<z@test.ex> QUIT @@ -247,6 +264,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok@otherhost21> RCPT TO:<z@test.ex> QUIT @@ -265,6 +283,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2 +HELO test MAIL FROM:<ok2@otherhost21> RCPT TO:<z@test.ex> QUIT @@ -290,6 +309,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<ok@otherhost31> RCPT TO:<z@test.ex> QUIT @@ -308,6 +328,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<okok@otherhost31> RCPT TO:<z@test.ex> QUIT @@ -334,6 +355,7 @@ QUIT 250 OK **** sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3 +HELO test MAIL FROM:<okokok@otherhost31> RCPT TO:<z@test.ex> QUIT @@ -351,6 +373,7 @@ RCPT TO *sleep 2 **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5 +HELO test MAIL FROM:<okok@otherhost51> RCPT TO:<z@test.ex> QUIT @@ -376,6 +399,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6 +HELO test MAIL FROM:<okokok@otherhost52> RCPT TO:<z@test.ex> QUIT @@ -395,6 +419,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7 +HELO test MAIL FROM:<ok7@otherhost53> RCPT TO:<z@test.ex> DATA @@ -415,6 +440,7 @@ RCPT TO *sleep 2 **** sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8 +HELO test MAIL FROM:<ok7@otherhost53> RCPT TO:<z@test.ex> DATA @@ -445,6 +471,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9 +HELO test MAIL FROM:<ok@otherhost9> RCPT TO:<z@test.ex> QUIT @@ -476,6 +503,7 @@ QUIT 250 OK **** sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10 +HELO test MAIL FROM:<ok@otherhost10> RCPT TO:<z@test.ex> QUIT diff --git a/test/scripts/0000-Basic/0580 b/test/scripts/0000-Basic/0580 index 5cce3e858..4d216677a 100644 --- a/test/scripts/0000-Basic/0580 +++ b/test/scripts/0000-Basic/0580 @@ -20,6 +20,7 @@ QUIT **** # exim -bs -odi +helo test mail from:<userx@ok.example> rcpt to:<usery@test.ex> data @@ -62,6 +63,7 @@ QUIT **** # exim -bs -odi +helo test mail from:<userx@ok.example> rcpt to:<usery@test.ex> rcpt to:<usery2@test.ex> @@ -104,6 +106,7 @@ QUIT **** # exim -bs -odi +helo test mail from:<userx@ok.example> rcpt to:<usery3@test.ex> rcpt to:<usery@test.ex> @@ -136,6 +139,7 @@ QUIT **** # exim -bs -odi +helo test mail from:<userx@ok.example> rcpt to:<usery4@test.ex> rcpt to:<usery5@test.ex> @@ -164,6 +168,7 @@ QUIT 221 bye **** exim -bs -odi +helo test mail from:<useri@ok.example> rcpt to:<remote@test.ex> rcpt to:<local@test.ex> diff --git a/test/scripts/0000-Basic/0582 b/test/scripts/0000-Basic/0582 index 6da20235a..da93d1a5e 100644 --- a/test/scripts/0000-Basic/0582 +++ b/test/scripts/0000-Basic/0582 @@ -16,6 +16,7 @@ QUIT **** # exim -bs -odi +helo test mail from:<userg@ok.example> rcpt to:<userg@test.ex> quit @@ -39,6 +40,7 @@ QUIT **** # exim -bs -odi +helo test mail from:<userh@ok.example> rcpt to:<userh@test.ex> data diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0584 index c7f543d36..8c629a1b5 100644 --- a/test/scripts/0000-Basic/0584 +++ b/test/scripts/0000-Basic/0584 @@ -2,6 +2,7 @@ # # pass exim -DOPT=userx@test.ex -bh 127.0.0.1 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data @@ -12,12 +13,14 @@ QUIT **** # fail exim -DOPT=fail@test.ex -bh 127.0.0.1 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> QUIT **** # check can use tainted data exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1 +helo test mail from:<userx@test.ex> rcpt to:<userx@test.ex> data diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0585 index c4ae477c1..b4d825893 100644 --- 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 +helo test mail from:<> rcpt to:<userx@dom.com> data @@ -11,6 +12,7 @@ quit **** ### Reject: no match exim -odq -bs +helo test 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 +helo test mail from:<> rcpt to:<userx@dom.com> data @@ -29,6 +32,7 @@ quit **** ### Accept, matches in header CC: exim -odq -bs +helo test 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 +helo test 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 +helo test mail from:<> rcpt to:<userx@dom.com> rcpt to:<usery@dom.com> diff --git a/test/scripts/0000-Basic/0593 b/test/scripts/0000-Basic/0593 index 81a1b4c03..00790ff1c 100644 --- a/test/scripts/0000-Basic/0593 +++ b/test/scripts/0000-Basic/0593 @@ -2,6 +2,7 @@ # # This should trap exim -bs -odi +helo test mail from:someone@some.domain rcpt to:fred@HOSTNAME data @@ -12,6 +13,7 @@ quit # taint trap defated by using create_file # goes on to fail on perms exim -bs -odi -DOPT=DIR/test-mail +helo test mail from:someone@some.domain rcpt to:bill@HOSTNAME data diff --git a/test/scripts/0000-Basic/0596 b/test/scripts/0000-Basic/0596 index 038254eab..72d2b1408 100644 --- a/test/scripts/0000-Basic/0596 +++ b/test/scripts/0000-Basic/0596 @@ -1,6 +1,7 @@ # $local_part_data, multi-rcpt message # exim -bs -odi +helo test mail from:<someone@some.domain> rcpt to:<CALLER@HOSTNAME> rcpt to:<b@remote> @@ -9,6 +10,7 @@ data quit **** exim -bs -odi +helo test mail from:<someone@some.domain> rcpt to:<a@remote> rcpt to:<CALLER@HOSTNAME> diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0599 index 360d536c0..b5aca88bf 100644 --- a/test/scripts/0000-Basic/0599 +++ b/test/scripts/0000-Basic/0599 @@ -6,6 +6,7 @@ perl aux-fixed/0601.udpserver **** # exim -bs -odi +helo test mail from:someone@some.domain rcpt to:CALLER@HOSTNAME data diff --git a/test/scripts/0000-Basic/0600 b/test/scripts/0000-Basic/0600 index 43f728822..eadbcb7a7 100644 --- a/test/scripts/0000-Basic/0600 +++ b/test/scripts/0000-Basic/0600 @@ -2,6 +2,7 @@ # # -bs to simple local delivery exim -bs -odi +helo test mail from:CALLER@HOSTNAME rcpt to:CALLER@HOSTNAME data @@ -20,6 +21,7 @@ This is the last line. quit **** exim -bs -odi +helo test mail from:CALLER@HOSTNAME rcpt to:CALLER@HOSTNAME data diff --git a/test/scripts/0000-Basic/0607 b/test/scripts/0000-Basic/0607 index 83c83b312..42dc1ca5e 100644 --- a/test/scripts/0000-Basic/0607 +++ b/test/scripts/0000-Basic/0607 @@ -7,6 +7,7 @@ exim -DSERVER=server -bd -oX PORT_D **** # exim -bs +HELO test MAIL FROM:<CALLER@myhost.test.ex> RCPT TO: <testx@cname46.test.ex> DATA diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609 index 86f75326f..79f214ba8 100644 --- a/test/scripts/0000-Basic/0609 +++ b/test/scripts/0000-Basic/0609 @@ -12,6 +12,8 @@ exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D # Server delays 4s before accepting RCPT client 127.0.0.1 PORT_D ??? 220 +helo test +??? 250 mail from:<x@y.test.ex> ??? 250 rcpt to:<delay4_accept@y.test.ex> @@ -24,6 +26,8 @@ quit # but client closes connection client 127.0.0.1 PORT_D ??? 220 +helo test +??? 250 mail from:<x@y.test.ex> ??? 250 rcpt to:<delay4_accept@y.test.ex> diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610 index ff690f63f..758e7fb43 100644 --- a/test/scripts/0000-Basic/0610 +++ b/test/scripts/0000-Basic/0610 @@ -5,6 +5,7 @@ exim -DSERVER=server -bd -oX PORT_D **** # exim -bs +HELO test MAIL FROM:<t1@dustyshoes.tld> RCPT TO:<fred@anotherone.tld> DATA diff --git a/test/scripts/0000-Basic/0614 b/test/scripts/0000-Basic/0614 index 38e374a1f..0d23186d1 100644 --- a/test/scripts/0000-Basic/0614 +++ b/test/scripts/0000-Basic/0614 @@ -8,6 +8,7 @@ exim -DSERVER=server -bd -oX PORT_D **** # exim -bs +helo test mail from:ralph@dustyshoes.tld rcpt to:bob@anotherone.tld data diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615 index a24d194fa..1712c888f 100644 --- a/test/scripts/0000-Basic/0615 +++ b/test/scripts/0000-Basic/0615 @@ -7,6 +7,7 @@ exim -DSERVER=server -bd -oX PORT_D **** # exim -bs +helo test mail from:ralph@dustyshoes.tld rcpt to:bob@anotherone.tld data |