Fix logging of drop-after-EHLO-reject.

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

diff --git a/test/scripts/0000-Basic/0900 b/test/scripts/0000-Basic/0900
index 435906d608182dab1cddd8f551e1bf541d70870b..4503ae0c01b9419212bd4cc6f47cca9456878d9b 100644 (file)
--- a/test/scripts/0000-Basic/0900
+++ b/test/scripts/0000-Basic/0900
@@ -14,7 +14,7 @@ ehlo tester
 ??? 250 HELP
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 88 last
 To: Susan@random.com
@@ -41,7 +41,7 @@ ehlo tester
 ??? 250 
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 100
 To: Susan@random.com
@@ -57,7 +57,7 @@ bdat 0 last
 ??? 250
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 10
 To: Susan@bdat 78 last
@@ -85,7 +85,7 @@ ehlo tester
 ??? 250 
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 89 last
 To: Susan@random.com
@@ -108,7 +108,7 @@ ehlo tester
 ??? 250 
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 88
 To: Susan@random.com
@@ -134,7 +134,7 @@ ehlo tester
 ??? 250 
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 88
 To: Susan@random.com
@@ -155,7 +155,7 @@ EHLO tester
 ??? 250 
 mail from:someone@some.domain
 ??? 250
-rcpt to:CALLER@HOSTNAME
+rcpt to:CALLER@test.ex
 ??? 250
 bdat 88
 To: Susan@random.com
@@ -182,7 +182,7 @@ EHLO tester
 ??? 250-PIPELINING
 ??? 250-CHUNKING
 ??? 250 HELP
-MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@HOSTNAME>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
+MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
 ??? 250
 ??? 250
 ??? 250-
@@ -191,5 +191,55 @@ quit
 ??? 221
 ****
 #
+# plain, longer message (xple chunks), RCPT rejected
+# pipelined
+client 127.0.0.1 PORT_D
+??? 220
+EHLO tester
+??? 250-
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250-CHUNKING
+??? 250 HELP
+MAIL FROM:<someone@some.domain>\r\nRCPT TO:<dummy@reject.ex>\r\nBDAT 86\r\nTo: Susan@random.com\r\nFrom: Sal@random.com\r\nSubject: This is a bodyless test message\r\nBDAT 6 LAST\r\nZZ\r\n
+??? 250
+??? 550
+??? 503-
+??? 503-
+??? 503
+??? 503-
+??? 503-
+??? 503
+quit
+??? 221
+****
+#
+# plain, small message (no body)
+# header line with bad line-ending
+client 127.0.0.1 PORT_D
+??? 220
+ehlo tester
+??? 250-
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250-CHUNKING
+??? 250 HELP
+mail from:someone@some.domain
+??? 250
+rcpt to:CALLER@test.ex
+??? 250
+bdat 87 last
+>>> To: Susan@random.com\n
+From: Sam@random.com
+Subject: This is a Bodyless test message
+
+??? 552
+quit
+??? 221
+****
+#
+#
 killdaemon
 no_msglog_check