Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / rejectlog / 4000

diff --git a/test/rejectlog/4000 b/test/rejectlog/4000
index c477c0534e3e2869d2db7690a8b6ada7a1576aaf..d401a5e78d5b50a4fc3a63fd07a566cc5e09d320 100644 (file)
--- a/test/rejectlog/4000
+++ b/test/rejectlog/4000
@@ -1,11 +1,19 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: Found Eicar-Test-Signature
+1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected during MIME ACL checks: this is a deny from the mime acl

 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test.ex)
+       by myhost.test.ex with local-esmtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-  Subject: a virus test
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+F From: J Caesar <jcaesar@test.ex>
+T To: a-list00@exim.org
+I Message-ID: <20041217133502.GA3059@test.ex>
+  Mime-Version: 1.0
+  Content-Type: application/pdf;
+ name*=''2015.11.13%20-%20Pr%C3%A4sentation%20GI%20-%20LK.PDF
+  Content-Disposition: attachment;
+ filename*=''2015.11.13%20-%20Pr%C3%A4sentation%20GI%20-%20LK.PDF
+  Subject: Nasty6
+S Sender: CALLER_NAME <CALLER@myhost.test.ex>