Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / mail / 4620.CALLER

diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index b0a1372da48462fd3408b7da4d4e800d01e75c91..8daaeed5fd3d287ff33cd42f35354cc2800ba86c 100644 (file)
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -1,11 +1,11 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00

-       for SRS0=12a1=yg=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>

-To: SRS0=12a1=yg=the.local.host.name=CALLER@test.ex
+To: SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex

 References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0


@@ -36,10 +36,10 @@ Status: 5.0.0
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
 

-Return-path: <SRS0=12a1=yg=the.local.host.name=CALLER@test.ex>
+Return-path: <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>

 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
        by the.local.host.name with esmtp (Exim x.yz)
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
        by the.local.host.name with esmtp (Exim x.yz)

-       (envelope-from <SRS0=12a1=yg=the.local.host.name=CALLER@test.ex>)
+       (envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>)

        id 10HmaY-0005vi-00
        for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)