Debug: config file name & line number for each ACL verb

(cherry picked from commit 9e160d8100cd15517a3444c1ad8ab81e51399582)

1 files changed, 26 insertions, 26 deletions

diff --git a/test/stderr/0569 b/test/stderr/0569
index 168f0eb53..78ef6d30f 100644
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -7,23 +7,23 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
@@ -36,19 +36,19 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
@@ -63,19 +63,19 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> usery@exim.test.ex in "usery@exim.test.ex"? yes (matched "usery@exim.test.ex")
 >>> check set acl_m_message = I do not like your message
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
@@ -90,19 +90,19 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
@@ -117,23 +117,23 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
@@ -146,23 +146,23 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 22)
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_message"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}
 >>> check verify = header_names_ascii
 >>> require: condition test succeeded in ACL "check_message"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 LOG: 10HmaZ-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss