Handle a v4mapped sender address given us by a proxy. Bug 2855

[exim.git] / test / stdout / 3415

diff --git a/test/stdout/3415 b/test/stdout/3415
index d806fa66cf5dbac41aa6d6a5cb33134180082b28..11060a1b9e831e037a5c6f3dec2129716b779309 100644 (file)
--- a/test/stdout/3415
+++ b/test/stdout/3415
@@ -156,11 +156,12 @@ EXIMUSER EXIM_UID EXIM_GID
 <username@myhost.test.ex>
 ddddddddd 0
 -received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 --helo_name rhu.barb
--host_address 127.0.0.1.9999
+-host_address [127.0.0.1]:9999
 -host_auth au1
 -host_auth_pubname PLAIN
--interface_address 127.0.0.1.1225
+-interface_address [127.0.0.1]:1112
 -received_protocol esmtpa
 -body_linecount 0
 -max_received_linelength 0
@@ -174,7 +175,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        (envelope-from <username@myhost.test.ex>)
        id 10HmaX-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: a@y
 dddS Sender: username@myhost.test.ex
@@ -184,11 +186,12 @@ EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
 -received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 --helo_name rhu.barb
--host_address 127.0.0.1.9999
+-host_address [127.0.0.1]:9999
 -host_auth au1
 -host_auth_pubname PLAIN
--interface_address 127.0.0.1.1225
+-interface_address [127.0.0.1]:1112
 -received_protocol esmtpa
 -body_linecount 0
 -max_received_linelength 0
@@ -201,7 +204,8 @@ x@y
 dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmaY-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: username@myhost.test.ex
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -210,11 +214,12 @@ EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
 -received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 --helo_name rhu.barb
--host_address 127.0.0.1.9999
+-host_address [127.0.0.1]:9999
 -host_auth au1
 -host_auth_pubname PLAIN
--interface_address 127.0.0.1.1225
+-interface_address [127.0.0.1]:1112
 -received_protocol esmtpa
 -body_linecount 0
 -max_received_linelength 0
@@ -227,7 +232,8 @@ x@y
 dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmaZ-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 dddF From: username@another.domain
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -236,11 +242,12 @@ EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
 -received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 --helo_name rhu.barb
--host_address 127.0.0.1.9999
+-host_address [127.0.0.1]:9999
 -host_auth au1
 -host_auth_pubname PLAIN
--interface_address 127.0.0.1.1225
+-interface_address [127.0.0.1]:1112
 -received_protocol esmtpa
 -body_linecount 0
 -max_received_linelength 0
@@ -253,7 +260,8 @@ x@y
 dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmbA-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 dddF From: username@auth.id.domain
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -262,11 +270,12 @@ EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
 -received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 --helo_name rhu.barb
--host_address 127.0.0.1.9999
+-host_address [127.0.0.1]:9999
 -host_auth au1
 -host_auth_pubname PLAIN
--interface_address 127.0.0.1.1225
+-interface_address [127.0.0.1]:1112
 -received_protocol esmtpa
 -body_linecount 0
 -max_received_linelength 15
@@ -279,7 +288,8 @@ x@y
 dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmbB-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 dddF From: abc@x.y.z
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 dddS Sender: username@auth.id.domain