Callouts: simplfy logging

[users/jgh/exim.git] / test / stderr / 4507

diff --git a/test/stderr/4507 b/test/stderr/4507
index 1df9537ea96f71bc67a560140c6da8e06e1b57a6..48d4d9fa9caff10c1ccb031f80d76e05589ad2e4 100644 (file)
--- a/test/stderr/4507
+++ b/test/stderr/4507
@@ -9,14 +9,26 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> xxx in helo_lookup_domains? no (end of list)
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 43)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded]
->>> processing "accept"
->>> check logwrite = signer: test.ex bits: 1024
+>>> using ACL "check_dkim"
+>>> processing "warn" (TESTSUITE/test-config 34)
+>>> check logwrite = signer: $dkim_cur_signer bits: $dkim_key_length
+>>>                = signer: test.ex bits: 1024
 LOG: 10HmaX-0005vi-00 signer: test.ex bits: 1024
->>> accept: condition test succeeded in inline ACL
->>> end of inline ACL: ACCEPT
-LOG: 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net
+>>> warn: condition test succeeded in ACL "check_dkim"
+>>> processing "accept" (TESTSUITE/test-config 37)
+>>> accept: condition test succeeded in ACL "check_dkim"
+>>> end of ACL "check_dkim": ACCEPT
+LOG: 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded]
+>>> using ACL "check_data"
+>>> processing "accept" (TESTSUITE/test-config 41)
+>>> check logwrite = ${authresults {$primary_hostname}}
+>>>                = Authentication-Results: myhost.test.ex;
+>>>    dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1
+LOG: 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n        dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1
+>>> accept: condition test succeeded in ACL "check_data"
+>>> end of ACL "check_data": ACCEPT
+LOG: 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net