Expansions: A tls option on ${readsocket }. Bug 2282

[exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index 594bd002caf17857da60a6e121f9ca3e31be37d5..68bba6ee1562a6b9f8065d80f82379a61ad2cd4b 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -29,7 +29,7 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed)
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -62,8 +62,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
-PDKIM >> raw hdr: To:{SP}abc@domain.{CR}{LF}
-PDKIM >> raw hdr: .{CR}{LF}
 >>Headers received:
 To: abc@domain.
 
@@ -81,14 +79,11 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
-PDKIM >> raw hdr: quit{CR}{LF}
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 accept: condition test succeeded in ACL "check_data"
 end of ACL "check_data": ACCEPT
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 DSN: Write SPOOL :-dsn_envid NULL
 DSN: Write SPOOL :-dsn_ret 0
@@ -106,7 +101,7 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -138,8 +133,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
-PDKIM >> raw hdr: To:{SP}abc@xyz.{CR}{LF}
-PDKIM >> raw hdr: .{CR}{LF}
 >>Headers received:
 To: abc@xyz.
 
@@ -157,7 +150,6 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
-PDKIM >> raw hdr: quit{CR}{LF}
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
@@ -172,4 +164,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>