tidying

[exim.git] / test / stderr / 4507

diff --git a/test/stderr/4507 b/test/stderr/4507
index e1961ceb30e1795ec245033a8fc87203f5ea1dc2..e38680c4dd2f30ce361bf84efa76d1e47738ad49 100644 (file)
--- a/test/stderr/4507
+++ b/test/stderr/4507
@@ -8,27 +8,38 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> xxx in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> xxx in helo_lookup_domains? no (end of list)
->>> processing "accept"
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_dkim"
->>> processing "warn"
+>>> processing ACL check_dkim "warn" (TESTSUITE/test-config 38)
 >>> check logwrite = signer: $dkim_cur_signer bits: $dkim_key_length
 >>>                = signer: test.ex bits: 1024
-LOG: 10HmaX-0005vi-00 signer: test.ex bits: 1024
->>> warn: condition test succeeded in ACL "check_dkim"
->>> processing "accept"
->>> 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]
+LOG: 10HmaX-000000005vi-0000 signer: test.ex bits: 1024
+>>> warn: condition test succeeded in ACL check_dkim
+>>> processing ACL check_dkim "accept" (TESTSUITE/test-config 41)
+>>> accept: condition test succeeded in ACL check_dkim
+>>> end of ACL check_dkim: ACCEPT
+LOG: 10HmaX-000000005vi-0000 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded]
 >>> using ACL "check_data"
->>> processing "accept"
+>>> processing ACL check_data "warn" (TESTSUITE/test-config 45)
 >>> 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
+LOG: 10HmaX-000000005vi-0000 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1
+>>> warn: condition test succeeded in ACL check_data
+>>> processing ACL check_data "accept" (TESTSUITE/test-config 46)
+>>> check dkim_status = pass
+>>> pass in "pass"?
+>>>  list element: pass
+>>>  pass in "pass"? yes (matched "pass")
+>>> check logwrite = dkim_status includes pass
+LOG: 10HmaX-000000005vi-0000 dkim_status includes pass
+>>> accept: condition test succeeded in ACL check_data
+>>> end of ACL check_data: ACCEPT
+LOG: 10HmaX-000000005vi-0000 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net