Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stderr / 0303

diff --git a/test/stderr/0303 b/test/stderr/0303
index a5d98ee97908f3a1bc13d95b2382e63de716ea51..8a77fd613de4989cce4bdef8dc85493d68d083c6 100644 (file)
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -78,7 +78,7 @@ SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
 250 HELP
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 250 HELP
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0

-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"


@@ -89,6 +89,8 @@ 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}

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


@@ -101,6 +103,7 @@ P Received: from [V4NET.2.3.4]
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; 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


@@ -154,7 +157,7 @@ SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
 250 HELP
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 250 HELP
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0

-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept"


@@ -165,6 +168,8 @@ 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}

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


@@ -177,6 +182,7 @@ P Received: from host.name.tld ([V4NET.2.3.4])
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; 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