DKIM: tighten up parsing for DKIM DNS and header records. Bug 3056

[exim.git] / test / stderr / 0026

diff --git a/test/stderr/0026 b/test/stderr/0026
index be1f27bd68b2e491993c0d8c5b1a7eccfd02afdf..5ab7d4da7a50c7a7c290d2492163fc450770d1f4 100644 (file)
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -6,7 +6,11 @@
 >>> 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)
->>> processing "accept" (TESTSUITE/test-config 60)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
+>>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -19,13 +23,13 @@
 >>> processing "warn" (TESTSUITE/test-config 23)
 >>> check logwrite = \$h_from: '$h_from:'
 >>>                = $h_from: '@'
-LOG: 10HmbI-0005vi-00 $h_from: '@'
+LOG: 10HmbI-000000005vi-0000 $h_from: '@'
 >>> warn: condition test succeeded in ACL "acl_data"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>> check verify = header_syntax
 >>> require: condition test failed in ACL "acl_data"
 >>> end of ACL "acl_data": not OK
-LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
+LOG: 10HmbI-000000005vi-0000 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -34,7 +38,11 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>> 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)
->>> processing "accept" (TESTSUITE/test-config 60)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
+>>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -45,4 +53,4 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_data"
 >>> end of ACL "acl_data": DENY
-LOG: 10HmbJ-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger
+LOG: 10HmbJ-000000005vi-0000 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: body contains trigger