Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stderr / 0022

diff --git a/test/stderr/0022 b/test/stderr/0022
index 75c28202963363feebcc19bcfa05b9df8c3adfd1..e3269500f7d04d4f593854b665d046b6040567a0 100644 (file)
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -41,7 +41,9 @@ 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

-host in ignore_fromline_hosts? no (option unset)
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Testing{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}

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


@@ -55,6 +57,7 @@ P Received: from [V4NET.9.8.7]
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -113,7 +116,9 @@ 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

-host in ignore_fromline_hosts? no (option unset)
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Testing{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}

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


@@ -127,6 +132,7 @@ P Received: from [V4NET.9.8.7]
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

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

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -183,7 +189,9 @@ 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

-host in ignore_fromline_hosts? no (option unset)
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Testing{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}

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


@@ -200,6 +208,7 @@ P Received: from [V4NET.9.8.7]
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: warn user message
 >>
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: warn user message
 >>

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

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN