Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 0018

diff --git a/test/stderr/0018 b/test/stderr/0018
index b6a0c1f642379b0a5c9185b59a17579c44ce8192..f3f3e56c08603b24dde0cf7b088fe387263a1c6b 100644 (file)
--- a/test/stderr/0018
+++ b/test/stderr/0018
@@ -8,17 +8,19 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_etrn"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_etrn"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 17)

 >>> check hosts = !localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 >>> host in "!localhost"? no (matched "!localhost")
 >>> check hosts = !localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 >>> host in "!localhost"? no (matched "!localhost")

->>> deny: condition test failed
->>> processing "warn"
->>> warn: condition test succeeded
+>>> deny: condition test failed in ACL "check_etrn"
+>>> processing "warn" (TESTSUITE/test-config 18)
+>>> l_message: accepted $smtp_command
+>>> warn: condition test succeeded in ACL "check_etrn"

 LOG: H=[127.0.0.1] Warning: accepted etrn #some.random.domain
 LOG: H=[127.0.0.1] Warning: accepted etrn #some.random.domain

->>> processing "accept"
->>> accept: condition test succeeded
+>>> processing "accept" (TESTSUITE/test-config 19)
+>>> accept: condition test succeeded in ACL "check_etrn"
+>>> end of ACL "check_etrn": ACCEPT

 >>> ETRN command is: exim -R
 >>> ETRN command execution skipped
 >>> ETRN command is: exim -R
 >>> ETRN command execution skipped