fix doubled logging of message_id

[exim.git] / test / stdout / 3500

diff --git a/test/stdout/3500 b/test/stdout/3500
index deaae921b851b7f8a7ded6b791da44da376968a3..ee35a18ba11ba4ddb4c6685512aacec45dd9955c 100644 (file)
--- a/test/stdout/3500
+++ b/test/stdout/3500
@@ -1,7 +1,9 @@
 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.host [10.0.0.1]\r
 250-SIZE 52428800\r
+250-8BITMIME\r
 250-ETRN\r
+250-VRFY\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
@@ -11,12 +13,14 @@
 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
 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 test.host [10.0.0.1]\r
 250-SIZE 52428800\r
+250-8BITMIME\r
 250-ETRN\r
+250-VRFY\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
@@ -32,7 +36,9 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.4]\r
 250-SIZE 52428800\r
+250-8BITMIME\r
 250-ETRN\r
+250-VRFY\r
 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r
@@ -45,7 +51,9 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.1]\r
 250-SIZE 52428800\r
+250-8BITMIME\r
 250-ETRN\r
+250-VRFY\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
@@ -55,7 +63,32 @@
 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
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection\r
+
+**** SMTP testing session as if from host 10.0.0.5
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello test.host [10.0.0.5]\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-ETRN\r
+250-VRFY\r
+250-EXPN\r
+250-PIPELINING\r
+250-AUTH CRAM-MD5\r
+250 HELP\r
+334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+\r
+535 Incorrect authentication data\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaZ-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!