Avoid trying to talk TLS over a known-closed channel

[exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 25c6cdbeedd1432cb7c5f8b1a21839a1133cd716..02344c6c745d2acae69619b1cfe45a4387049b54 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -74,10 +74,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called

-PDKIM >> raw hdr: {CR}{LF}
-PDKIM >> raw hdr: .{CR}{LF}
-PDKIM >> raw hdr: vrfy{SP}x@y{CR}{LF}
-PDKIM >> raw hdr: mail{SP}from:<x@y>{CR}{LF}

 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 
 search_tidyup called


@@ -91,7 +87,6 @@ P Received: from [V4NET.0.0.0] (helo=something)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM >> raw hdr: quit{CR}{LF}

 using ACL "data"
 processing "accept"
 check set acl_m0 = $acl_m0; data
 using ACL "data"
 processing "accept"
 check set acl_m0 = $acl_m0; data


@@ -100,8 +95,6 @@ check set acl_m9 = $acl_m9; data
                  = ; rcpt; data
 accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT
                  = ; rcpt; data
 accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL

 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00


@@ -147,4 +140,4 @@ SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>