git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: munge and shuffle for non-TLS build
[exim.git]
/
test
/
stdout
/
0035
diff --git
a/test/stdout/0035
b/test/stdout/0035
index 6855c1d3189209b077706b188b9788db5d4de233..06c5c99e57e4ef1cc71c9bff06f6e55370299e60 100644
(file)
--- a/
test/stdout/0035
+++ b/
test/stdout/0035
@@
-4,13
+4,15
@@
Connecting to 127.0.0.1 port 1225 ... connected
>>> ehlo rhu.barb
??? 250-
<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
>>> ehlo rhu.barb
??? 250-
<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
-??? 250-
+??? 250-
SIZE
<<< 250-SIZE 52428800
<<< 250-SIZE 52428800
-??? 250-
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-8BITMIME
<<< 250-8BITMIME
<<< 250-8BITMIME
-??? 250-
+??? 250-
PIPELINING
<<< 250-PIPELINING
<<< 250-PIPELINING
-??? 250
+??? 250
HELP
<<< 250 HELP
>>> mail from:<notsubmit@y>
??? 250
<<< 250 HELP
>>> mail from:<notsubmit@y>
??? 250
@@
-23,7
+25,7
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 354 Enter message, ending with "." on a line by itself
>>> .
??? 250
<<< 354 Enter message, ending with "." on a line by itself
>>> .
??? 250
-<<< 250 OK id=10HmaX-000
5vi-
00
+<<< 250 OK id=10HmaX-000
000005vi-00
00
>>> mail from:<a@y>
??? 250
<<< 250 OK
>>> mail from:<a@y>
??? 250
<<< 250 OK
@@
-35,7
+37,7
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 354 Enter message, ending with "." on a line by itself
>>> .
??? 250
<<< 354 Enter message, ending with "." on a line by itself
>>> .
??? 250
-<<< 250 OK id=10HmaY-000
5vi-
00
+<<< 250 OK id=10HmaY-000
000005vi-00
00
>>> mail from:<>
??? 250
<<< 250 OK
>>> mail from:<>
??? 250
<<< 250 OK
@@
-47,7
+49,7
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 354 Enter message, ending with "." on a line by itself
>>> .
??? 250
<<< 354 Enter message, ending with "." on a line by itself
>>> .
??? 250
-<<< 250 OK id=10HmaZ-000
5vi-
00
+<<< 250 OK id=10HmaZ-000
000005vi-00
00
>>> mail from:<notsubmit@y>
??? 250
<<< 250 OK
>>> mail from:<notsubmit@y>
??? 250
<<< 250 OK
@@
-60,7
+62,7
@@
Connecting to 127.0.0.1 port 1225 ... connected
>>> Sender: sender@some.where
>>> .
??? 250
>>> Sender: sender@some.where
>>> .
??? 250
-<<< 250 OK id=10HmbA-000
5vi-
00
+<<< 250 OK id=10HmbA-000
000005vi-00
00
>>> mail from:<a@y>
??? 250
<<< 250 OK
>>> mail from:<a@y>
??? 250
<<< 250 OK
@@
-73,7
+75,7
@@
Connecting to 127.0.0.1 port 1225 ... connected
>>> Sender: sender@some.where
>>> .
??? 250
>>> Sender: sender@some.where
>>> .
??? 250
-<<< 250 OK id=10HmbB-000
5vi-
00
+<<< 250 OK id=10HmbB-000
000005vi-00
00
>>> quit
??? 221
<<< 221 myhost.test.ex closing connection
>>> quit
??? 221
<<< 221 myhost.test.ex closing connection
@@
-87,6
+89,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-104,7
+108,7
@@
Connecting to 127.0.0.1 port 1225 ... connected
>>> Sender: sender@some.where
>>> .
??? 250
>>> Sender: sender@some.where
>>> .
??? 250
-<<< 250 OK id=10HmbC-000
5vi-
00
+<<< 250 OK id=10HmbC-000
000005vi-00
00
>>> quit
??? 221
<<< 221 myhost.test.ex closing connection
>>> quit
??? 221
<<< 221 myhost.test.ex closing connection
@@
-118,6
+122,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@
-135,18
+141,20
@@
Connecting to 127.0.0.1 port 1225 ... connected
>>> Sender: sender@some.where
>>> .
??? 250
>>> Sender: sender@some.where
>>> .
??? 250
-<<< 250 OK id=10HmbD-000
5vi-
00
+<<< 250 OK id=10HmbD-000
000005vi-00
00
>>> quit
??? 221
<<< 221 myhost.test.ex closing connection
End of script
>>> quit
??? 221
<<< 221 myhost.test.ex closing connection
End of script
-10HmaX-000
5vi-
00-H
+10HmaX-000
000005vi-00
00-H
EXIMUSER EXIM_UID EXIM_GID
<notsubmit@y>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<notsubmit@y>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 0
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 0
@@
-158,15
+166,18
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <notsubmit@y>)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <notsubmit@y>)
- id 10HmaX-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-10HmaY-0005vi-00-H
+ id 10HmaX-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
+10HmaY-000000005vi-0000-H
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 0
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 0
@@
-178,18
+189,21
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
- id 10HmaY-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+ id 10HmaY-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
+054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
dddF From: a@y
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
dddF From: a@y
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmaZ-000
5vi-
00-H
+10HmaZ-000
000005vi-00
00-H
EXIMUSER EXIM_UID EXIM_GID
<>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 0
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 0
@@
-200,17
+214,20
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
- id 10HmaZ-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+ id 10HmaZ-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
+054I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmbA-000
5vi-
00-H
+10HmbA-000
000005vi-00
00-H
EXIMUSER EXIM_UID EXIM_GID
<notsubmit@y>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<notsubmit@y>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
@@
-222,16
+239,19
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <notsubmit@y>)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <notsubmit@y>)
- id 10HmbA-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+ id 10HmbA-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
dddS Sender: sender@some.where
dddS Sender: sender@some.where
-10HmbB-000
5vi-
00-H
+10HmbB-000
000005vi-00
00-H
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
@@
-243,19
+263,22
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
- id 10HmbB-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+ id 10HmbB-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
ddd* Sender: sender@some.where
ddd* Sender: sender@some.where
-0
47I Message-Id: <E10HmbB-0005vi-
00@myhost.test.ex>
+0
54I Message-Id: <E10HmbB-000000005vi-00
00@myhost.test.ex>
dddF From: a@y
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
dddF From: a@y
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmbC-000
5vi-
00-H
+10HmbC-000
000005vi-00
00-H
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
@@
-267,19
+290,22
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
- id 10HmbC-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+ id 10HmbC-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
dddS Sender: sender@some.where
dddS Sender: sender@some.where
-0
47I Message-Id: <E10HmbC-0005vi-
00@myhost.test.ex>
+0
54I Message-Id: <E10HmbC-000000005vi-00
00@myhost.test.ex>
dddF From: a@y
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
dddF From: a@y
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmbD-000
5vi-
00-H
+10HmbD-000
000005vi-00
00-H
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
EXIMUSER EXIM_UID EXIM_GID
<a@y>
ddddddddd 0
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
+--helo_name rhu.barb
+-host_address [127.0.0.1]:9999
+-interface_address [127.0.0.1]:1112
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
-received_protocol esmtp
-body_linecount 0
-max_received_linelength 25
@@
-291,9
+317,10
@@
x@y
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
dddP Received: from [127.0.0.1] (helo=rhu.barb)
by myhost.test.ex with esmtp (Exim x.yz)
(envelope-from <a@y>)
- id 10HmbD-0005vi-00
- for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+ id 10HmbD-000000005vi-0000
+ for x@y;
+ Tue, 2 Mar 1999 09:44:33 +0000
ddd* Sender: sender@some.where
ddd* Sender: sender@some.where
-0
47I Message-Id: <E10HmbD-0005vi-
00@myhost.test.ex>
+0
54I Message-Id: <E10HmbD-000000005vi-00
00@myhost.test.ex>
dddF From: SomeName <a@y>
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
dddF From: SomeName <a@y>
038 Date: Tue, 2 Mar 1999 09:44:33 +0000