handle more of the new format version numbers

[users/jgh/exim.git] / test / stdout / 0458

diff --git a/test/stdout/0458 b/test/stdout/0458
index b9b54b4db1b06362f9a505a22b128d30c5216c23..8bf7195016e96ab0f19de1e5e42d5f06ced13a0a 100644 (file)
--- 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
 <<< 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
 >>> 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
 <<< 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
 <<< 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 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
 >>> 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 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
 <<< 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
 <<< 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
 >>> 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
 <<< 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
 <<< 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 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
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221