X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ac9a0d9193d7d7ccd27aa8ebf31eb484182c3db4..7a7d145e80c7186e811628c0dea8f6afc26b73ff:/test/stdout/5400?ds=sidebyside diff --git a/test/stdout/5400 b/test/stdout/5400 index 05f2ef037..6089910b9 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -7,7 +7,7 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmaX-0005vi-00 +250 OK id=10HmaX-000000005vi-0000 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 myhost.test.ex @@ -18,7 +18,7 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmaY-0005vi-00 +250 OK id=10HmaY-000000005vi-0000 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 myhost.test.ex @@ -30,7 +30,7 @@ 250 Accepted 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmaZ-0005vi-00 +250 OK id=10HmaZ-000000005vi-0000 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 myhost.test.ex @@ -41,7 +41,7 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbA-0005vi-00 +250 OK id=10HmbA-000000005vi-0000 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 myhost.test.ex @@ -50,10 +50,22 @@ 250-PIPELINING 250 HELP 250 OK +550 Administrative prohibition 250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmbB-000000005vi-0000 +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 myhost.test.ex +250-SIZE 52428800 +250-8BITMIME +250-PIPELINING +250 HELP +250 OK 250 Accepted +550 Administrative prohibition 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbB-0005vi-00 +250 OK id=10HmbC-000000005vi-0000 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 myhost.test.ex @@ -65,7 +77,7 @@ 250 Accepted 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbC-0005vi-00 +250 OK id=10HmbD-000000005vi-0000 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 myhost.test.ex @@ -77,7 +89,7 @@ 250 Accepted 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbD-0005vi-00 +250 OK id=10HmbE-000000005vi-0000 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 myhost.test.ex @@ -89,7 +101,7 @@ 250 Accepted 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbE-0005vi-00 +250 OK id=10HmbF-000000005vi-0000 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 myhost.test.ex @@ -101,7 +113,7 @@ 250 Accepted 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbF-0005vi-00 +250 OK id=10HmbG-000000005vi-0000 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 myhost.test.ex @@ -111,9 +123,8 @@ 250 HELP 250 OK 250 Accepted -250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbG-0005vi-00 +250 OK id=10HmbH-000000005vi-0000 221 myhost.test.ex closing connection ******** SERVER ******** @@ -131,9 +142,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 - for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmaX-000000005vi-0000 + for userx@domain.com; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -159,9 +171,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaY-0005vi-00 - for userz@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmaY-000000005vi-0000 + for userz@domain.com; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -187,8 +200,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmaZ-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -212,10 +226,11 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbA-0005vi-00 - for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 + id 10HmbA-000000005vi-0000 + for userx@domain.com; + Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-tpt: zzz -Message-Id: +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -244,19 +259,19 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM:<> 250 Sender OK -RCPT TO: -250 ok rcpt-1 RCPT TO: -250 ok rcpt-2 +250 ok rcpt-1 DATA 354 Send data Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbB-000000005vi-0000 + for userx@domain.com; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -285,19 +300,19 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM:<> 250 Sender OK RCPT TO: 250 ok rcpt-1 -RCPT TO: -250 ok rcpt-2 DATA 354 Send data Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbC-000000005vi-0000 + for userx@domain.com; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -336,7 +351,7 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM:<> 250 Sender OK RCPT TO: 250 ok rcpt-1 @@ -345,8 +360,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbD-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -361,7 +377,7 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM:<> 250 Sender OK RCPT TO: 250 ok rcpt-2 @@ -370,8 +386,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbD-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -397,8 +414,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbE-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -437,7 +455,7 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM:<> 250 Sender OK RCPT TO: 250 ok rcpt-1 @@ -446,8 +464,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbF-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -462,7 +481,7 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM:<> 250 Sender OK RCPT TO: 250 ok rcpt-2 @@ -471,8 +490,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbF-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -498,10 +518,46 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbG-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: + id 10HmbG-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbH-000000005vi-0000 + for userx@domain.com; + Tue, 2 Mar 1999 09:44:33 +0000 +Subject: singledot test +Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +This data has a line with a single dot... next: +.. +and this is the line right after. +Next we have a line with a leading dot: +..test +and this is the next line. . 250 OK