Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0026

diff --git a/test/stderr/0026 b/test/stderr/0026
index 9c780e2a190889bb963cdfa181c7b3d265bdd4b8..8fdd0ef0156f2809368ff86c565ab4ea89dcd6f1 100644 (file)
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -14,6 +14,7 @@
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmbI-000000005vi-0000 qualify/rewrite: domain missing or malformed
 >>> using ACL "acl_data"
 >>> processing "deny" (TESTSUITE/test-config 21)
 >>> l_message: body contains trigger
@@ -23,13 +24,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=(test) [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)
@@ -53,4 +54,4 @@ LOG: 10HmbI-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: domain mi
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_data"
 >>> end of ACL "acl_data": DENY
-LOG: 10HmbJ-0005vi-00 H=(test) [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