git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Testsuite: munge for EXPERIMENTAL_DSN_INFO
[exim.git] / test / stdout / 0035
diff --git a/test/stdout/0035 b/test/stdout/0035
index 60e2c62d2a9f1a232c99adf53d3a19c92bde3474..10c80a0d7dede387c4a83a21ffcef1fa7897eb10 100644 (file)
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -23,7 +23,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 354 Enter message, ending with "." on a line by itself
 >>> .
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaX-000000005vi-0000
 >>> mail from:<a@y>
 ??? 250
 <<< 250 OK
@@ -35,7 +35,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 354 Enter message, ending with "." on a line by itself
 >>> .
 ??? 250
-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmaY-000000005vi-0000
 >>> mail from:<>
 ??? 250
 <<< 250 OK
@@ -47,7 +47,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 354 Enter message, ending with "." on a line by itself
 >>> .
 ??? 250
-<<< 250 OK id=10HmaZ-0005vi-00
+<<< 250 OK id=10HmaZ-000000005vi-0000
 >>> mail from:<notsubmit@y>
 ??? 250
 <<< 250 OK
@@ -60,7 +60,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Sender: sender@some.where
 >>> .
 ??? 250
-<<< 250 OK id=10HmbA-0005vi-00
+<<< 250 OK id=10HmbA-000000005vi-0000
 >>> mail from:<a@y>
 ??? 250
 <<< 250 OK
@@ -73,7 +73,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Sender: sender@some.where
 >>> .
 ??? 250
-<<< 250 OK id=10HmbB-0005vi-00
+<<< 250 OK id=10HmbB-000000005vi-0000
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -104,7 +104,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Sender: sender@some.where
 >>> .
 ??? 250
-<<< 250 OK id=10HmbC-0005vi-00
+<<< 250 OK id=10HmbC-000000005vi-0000
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -135,19 +135,20 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Sender: sender@some.where
 >>> .
 ??? 250
-<<< 250 OK id=10HmbD-0005vi-00
+<<< 250 OK id=10HmbD-000000005vi-0000
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
-10HmaX-0005vi-00-H
+10HmaX-000000005vi-0000-H
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 ddddddddd 0
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -159,16 +160,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>)
-       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
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -180,19 +183,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>)
-       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
-10HmaZ-0005vi-00-H
+10HmaZ-000000005vi-0000-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -203,18 +208,20 @@ x@y
 
 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
-10HmbA-0005vi-00-H
+10HmbA-000000005vi-0000-H
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 ddddddddd 0
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -226,17 +233,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>)
-       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
-10HmbB-0005vi-00-H
+10HmbB-000000005vi-0000-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -248,20 +257,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>)
-       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
-047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+054I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
 dddF From: a@y
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmbC-0005vi-00-H
+10HmbC-000000005vi-0000-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -273,20 +284,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>)
-       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
-047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+054I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
 dddF From: a@y
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmbD-0005vi-00-H
+10HmbD-000000005vi-0000-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
 -received_time_usec .uuuuuu
--helo_name rhu.barb
--host_address 127.0.0.1.9999
--interface_address 127.0.0.1.1225
+-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
@@ -298,9 +311,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>)
-       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
-047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+054I Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex>
 dddF From: SomeName <a@y>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
Master Exim source repository