Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index 4f73548c15755a4110b22439fe125c564065b90c..0985a5e6841dbfda106f689d3aa5af06db270a95 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -27,10 +27,6 @@ SMTP<< helo [1.2.3.4]
 sender_fullhost = ([1.2.3.4]) [1.2.3.4]
 sender_rcvhost = [1.2.3.4]
 set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]
 sender_fullhost = ([1.2.3.4]) [1.2.3.4]
 sender_rcvhost = [1.2.3.4]
 set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]

-spf_init: [1.2.3.4] 1.2.3.4
-SPF_dns_exim_new
-spf_compile.c:523    Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R}
-spf_compile.c:1210   Debug: Compiling record v=spf1 

 SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0


@@ -64,7 +60,7 @@ set transport t1
 queued for t1 transport: local_part = rewritten-a
 domain = rewritten-b
   errors_to=NULL
 queued for t1 transport: local_part = rewritten-a
 domain = rewritten-b
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r1 router
   envelope to: rewritten-a@rewritten-b
   transport: t1
 routed by r1 router
   envelope to: rewritten-a@rewritten-b
   transport: t1


@@ -75,7 +71,6 @@ processing "accept" (TESTSUITE/test-config 18)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
 processing "require" (TESTSUITE/test-config 16)
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
 processing "require" (TESTSUITE/test-config 16)


@@ -90,10 +85,9 @@ processing "accept" (TESTSUITE/test-config 18)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
 search_tidyup called
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>