Testsuite: Add test for MAIL with spaces + options

3 files changed, 84 insertions, 1 deletions

diff --git a/test/scripts/0000-Basic/0121 b/test/scripts/0000-Basic/0121
index 9ff68fa13..9daae6448 100644
--- a/test/scripts/0000-Basic/0121
+++ b/test/scripts/0000-Basic/0121
@@ -1,4 +1,4 @@
-# Sender verification (envelope and header)
+# Sender verification SMTP (envelope and header)
 exim -bh 127.0.0.1
 mail from:<unknown@test.ex>
 rcpt to:<userx@test.ex>
@@ -29,3 +29,21 @@ from: <defer@test.ex>
 .
 quit
 ****
+# Sender verification (ESMTP)
+exim -bh 127.0.0.1
+ehlo foo.bar
+mail from:<ab@localhost1>
+rset
+ehlo foo.bar
+mail from:<"a b"@localhost2>
+rset
+ehlo foo.bar
+mail from:<"a b"@localhost3> SIZE=1234
+rset
+ehlo foo.bar
+mail from:"a b"@localhost4 SIZE=1234
+rset
+ehlo foo.bar
+mail from:<"a b"@localhost5> PRDR
+quit
+****
diff --git a/test/stderr/0121 b/test/stderr/0121
index a00b2faf1..b578cce97 100644
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -161,3 +161,27 @@ LOG: H=[127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>:
 >>>   message: forced defer
 >>> require: condition test deferred in ACL "check_message"
 LOG: 10HmaZ-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
+>>> host in hosts_connection_nolog? no (option unset)
+>>> host in host_lookup? no (option unset)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts? no (option unset)
+>>> host in helo_verify_hosts? no (option unset)
+>>> host in helo_try_verify_hosts? no (option unset)
+>>> host in helo_accept_junk_hosts? no (option unset)
+>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts? yes (matched "*")
diff --git a/test/stdout/0121 b/test/stdout/0121
index 5e3968243..d52013bcd 100644
--- a/test/stdout/0121
+++ b/test/stdout/0121
@@ -35,3 +35,44 @@
 354 Enter message, ending with "." on a line by itself

 451 Temporary local problem - please try later

 221 the.local.host.name closing connection

+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-the.local.host.name Hello foo.bar [127.0.0.1]

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+250 Reset OK

+250-the.local.host.name Hello foo.bar [127.0.0.1]

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+250 Reset OK

+250-the.local.host.name Hello foo.bar [127.0.0.1]

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+250 Reset OK

+250-the.local.host.name Hello foo.bar [127.0.0.1]

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+250 Reset OK

+250-the.local.host.name Hello foo.bar [127.0.0.1]

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250 HELP

+250 OK

+221 the.local.host.name closing connection