Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stdout / 0035

diff --git a/test/stdout/0035 b/test/stdout/0035
index c80d9fd9d036db40342db4fcc05052df3ea609db..09b5df4e90ab91394bd7dac0b155546e0154007d 100644 (file)
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
@@ -85,6 +87,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
@@ -114,6 +118,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-8BITMIME
+??? 250-
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
@@ -138,7 +144,8 @@ End of script
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -158,7 +165,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -174,14 +182,15 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: a@y
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -196,13 +205,14 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -223,7 +233,8 @@ dddS Sender: sender@some.where
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -239,15 +250,16 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmbB-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 ddd* Sender: sender@some.where
+047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 dddF From: a@y
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbC-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -263,15 +275,16 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmbC-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 dddS Sender: sender@some.where
+047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 dddF From: a@y
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbD-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 ddddddddd 0
--helo_name rhu.barb
+-received_time_usec .uuuuuu
+--helo_name rhu.barb
 -host_address 127.0.0.1.9999
 -interface_address 127.0.0.1.1225
 -received_protocol esmtp
@@ -287,7 +300,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmbD-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 ddd* Sender: sender@some.where
+047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 dddF From: SomeName <a@y>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000