SPF: fix handling mix of spf and other txt records. Bug 2499

[exim.git] / test / stdout / 3415

diff --git a/test/stdout/3415 b/test/stdout/3415
index bc9555c02281f862055baf9cf6b231ff329d0e3a..0889dd7957dc7fe14dfc2431c6b2afa9830b450b 100644 (file)
--- a/test/stdout/3415
+++ b/test/stdout/3415
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-AUTH PLAIN
@@ -52,6 +54,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-AUTH PLAIN
@@ -85,6 +89,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-AUTH PLAIN
@@ -118,6 +124,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250-
 <<< 250-AUTH PLAIN
@@ -147,13 +155,15 @@ End of script
 EXIMUSER EXIM_UID EXIM_GID
 <username@myhost.test.ex>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -host_auth au1
 -interface_address 127.0.0.1.1225
 -received_protocol esmtpa
 -body_linecount 0
--auth_id username
+-max_received_linelength 0
+--auth_id username
 -deliver_firsttime
 XX
 1
@@ -172,13 +182,15 @@ dddS Sender: username@myhost.test.ex
 EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -host_auth au1
 -interface_address 127.0.0.1.1225
 -received_protocol esmtpa
 -body_linecount 0
--auth_id username
+-max_received_linelength 0
+--auth_id username
 -deliver_firsttime
 XX
 1
@@ -195,13 +207,15 @@ dddF From: username@myhost.test.ex
 EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -host_auth au1
 -interface_address 127.0.0.1.1225
 -received_protocol esmtpa
 -body_linecount 0
--auth_id username
+-max_received_linelength 0
+--auth_id username
 -deliver_firsttime
 XX
 1
@@ -218,13 +232,15 @@ dddF From: username@another.domain
 EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -host_auth au1
 -interface_address 127.0.0.1.1225
 -received_protocol esmtpa
 -body_linecount 0
--auth_id username@auth.id.domain
+-max_received_linelength 0
+--auth_id username@auth.id.domain
 -deliver_firsttime
 XX
 1
@@ -241,13 +257,15 @@ dddF From: username@auth.id.domain
 EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -host_auth au1
 -interface_address 127.0.0.1.1225
 -received_protocol esmtpa
 -body_linecount 0
--auth_id username@auth.id.domain
+-max_received_linelength 15
+--auth_id username@auth.id.domain
 -deliver_firsttime
 XX
 1