Add RCPT error text to unexpected DATA error.

6 files changed, 74 insertions, 3 deletions

diff --git a/test/stdout/0091 b/test/stdout/0091
index 10cf780a9..809bad067 100644
--- a/test/stdout/0091
+++ b/test/stdout/0091
@@ -19,6 +19,8 @@
 550-Verification failed for <junk@jink.jonk.test.ex>

 550-Unrouteable address

 550 Sender verify failed

+503-All RCPT commands were rejected with this error:

+503-Sender verify failed

 503 valid RCPT command must precede DATA

 500 unrecognized command

 221 myhost.test.ex closing connection

diff --git a/test/stdout/0139 b/test/stdout/0139
index 3736dd4fd..e19fbb74a 100644
--- a/test/stdout/0139
+++ b/test/stdout/0139
@@ -24,6 +24,11 @@
 550-This is a very long blacklisting message, continuing for ages and ages and

 550-certainly being longer than 128 characters which was a previous limit on

 550 the length that Exim was prepared to handle.

+503-All RCPT commands were rejected with this error:

+503-host is listed in rbl3.test.ex with value 127.0.0.3

+503-This is a very long blacklisting message, continuing for ages and ages and

+503-certainly being longer than 128 characters which was a previous limit on

+503-the length that Exim was prepared to handle.

 503 valid RCPT command must precede DATA

 500 unrecognized command

 500 unrecognized command

diff --git a/test/stdout/0175 b/test/stdout/0175
index 92280840f..10cb2c731 100644
--- a/test/stdout/0175
+++ b/test/stdout/0175
@@ -6,6 +6,8 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

 550 Sender verify failed

+503-All RCPT commands were rejected with this error:

+503-Sender verify failed

 503 valid RCPT command must precede DATA

 500 unrecognized command

 221 the.local.host.name closing connection

@@ -17,6 +19,8 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

 550 Sender verify failed

+503-All RCPT commands were rejected with this error:

+503-Sender verify failed

 503 valid RCPT command must precede DATA

 500 unrecognized command

 221 the.local.host.name closing connection

diff --git a/test/stdout/0395 b/test/stdout/0395
index 03eedb7cf..21f34430a 100644
--- a/test/stdout/0395
+++ b/test/stdout/0395
@@ -9,6 +9,8 @@ rcpt to: userx
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 250 OK

 501 userx: recipient address must contain a domain

+503-All RCPT commands were rejected with this error:

+503-501 userx: recipient address must contain a domain

 503 valid RCPT command must precede DATA

 500 unrecognized command

 500 unrecognized command

diff --git a/test/stdout/0458 b/test/stdout/0458
index b9b54b4db..8bf719501 100644
--- a/test/stdout/0458
+++ b/test/stdout/0458
@@ -18,7 +18,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
+<<< 503 Valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -37,6 +41,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
@@ -62,7 +70,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 sender not yet given
 >>> DATA
 ??? 503
-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
+<<< 503 Valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -81,6 +93,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 sender not yet given
 >>> DATA
 ??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
@@ -112,7 +128,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
+<<< 503 Valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -137,6 +157,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
@@ -159,6 +183,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 sender not yet given
 >>> DATA
 ??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
diff --git a/test/stdout/0558 b/test/stdout/0558
new file mode 100644
index 000000000..aa3c21c74
--- /dev/null
+++ b/test/stdout/0558
@@ -0,0 +1,30 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-myhost.test.ex Hello CALLER at test.ex

+250-SIZE 52428800

+250-PIPELINING

+250 HELP

+250 OK

+550-Default deny message

+550 on two lines

+550-Default deny message

+550 on two lines

+550-Default deny message

+550 on two lines

+503-All RCPT commands were rejected with this error:

+503-Default deny message

+503-on two lines

+503 Valid RCPT command must precede DATA

+221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-myhost.test.ex Hello CALLER at test.ex

+250-SIZE 52428800

+250-PIPELINING

+250 HELP

+250 OK

+550-Default deny message

+550 on two lines

+550 Special deny message

+550-Default deny message

+550 on two lines

+503 Valid RCPT command must precede DATA

+221 myhost.test.ex closing connection