Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stdout / 0574

diff --git a/test/stdout/0574 b/test/stdout/0574
index 21794bff6ece876b7250e4522f3d41c17ec3ed48..449fd4cfed2d1745e8abf65b3b4b574880b92601 100644 (file)
--- a/test/stdout/0574
+++ b/test/stdout/0574
@@ -33,14 +33,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 End of script
 accept: condition test succeeded in ACL "chk_data"
 end of ACL "chk_data": ACCEPT
 End of script
 accept: condition test succeeded in ACL "chk_data"
 end of ACL "chk_data": ACCEPT

- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}

  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}

- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000

 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00

-DSN: Write SPOOL :-dsn_envid NULL
-DSN: Write SPOOL :-dsn_ret 0
-DSN: Flags :0
-DSN: **** SPOOL_OUT - address: |dest@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+DSN: **** SPOOL_OUT - address: <dest@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0

 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN


@@ -58,3 +55,4 @@ LOG: smtp_connection MAIN
   SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
 search_tidyup called
 SMTP>>(close on process exit)
   SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
 search_tidyup called
 SMTP>>(close on process exit)

+>>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>