Fix mismerge

[exim.git] / test / stdout / 0034

diff --git a/test/stdout/0034 b/test/stdout/0034
index f38421fe9976a36b4fa5a2991bd8fceab06f4b98..5727e1057395abfcdb692f8a54f82fe96b2b5cdf 100644 (file)
--- a/test/stdout/0034
+++ b/test/stdout/0034
@@ -7,83 +7,106 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 554 Too many nonmail commands\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello CALLER at test\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\r
 250 Reset OK\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbB-0005vi-00\r
+250 OK id=10HmbB-000000005vi-0000\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbC-000000005vi-0000\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbD-0005vi-00\r
+250 OK id=10HmbD-000000005vi-0000\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-myhost.test.ex Hello CALLER at a.b.c\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 554 Too many nonmail commands\r