diff options
Diffstat (limited to 'test/stderr')
139 files changed, 1125 insertions, 1073 deletions
diff --git a/test/stderr/0002 b/test/stderr/0002 index c8e10ef9e..a74e98c11 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -603,13 +603,13 @@ search_tidyup called >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmaX-0005vi-00 Subject is: "" +LOG: 10HmaX-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmaX-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -618,13 +618,13 @@ LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmaY-0005vi-00 Subject is: "" +LOG: 10HmaY-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b> +LOG: 10HmaY-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -633,13 +633,13 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmaZ-0005vi-00 Subject is: "" +LOG: 10HmaZ-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d> +LOG: 10HmaZ-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -648,13 +648,13 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmbA-0005vi-00 Subject is: "" +LOG: 10HmbA-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -663,13 +663,13 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmbB-0005vi-00 Subject is: "" +LOG: 10HmbB-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y> +LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -694,13 +694,13 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?=" -LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?=" +LOG: 10HmbC-000000005vi-0000 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?=" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbC-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -725,13 +725,13 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit" -LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit" +LOG: 10HmbD-000000005vi-0000 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbD-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=p1240 diff --git a/test/stderr/0021 b/test/stderr/0021 index 23c5b0cca..23de65a7b 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -299,4 +299,4 @@ LOG: smtp_connection MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT -1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers +1999-03-02 09:44:33 10HmaX-000000005vi-0000 10HmaX-000000005vi-0000 no recipients found in headers diff --git a/test/stderr/0022 b/test/stderr/0022 index 8a2bb0bc4..2eae4f906 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -59,18 +59,18 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D -Data file written for message 10HmbF-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbF-000000005vi-0000-D +Data file written for message 10HmbF-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmbF-0005vi-00 + id 10HmbF-000000005vi-0000 for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss -SMTP>> 250 OK id=10HmbF-0005vi-00 +SMTP>> 250 OK id=10HmbF-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection @@ -142,18 +142,18 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D -Data file written for message 10HmbG-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbG-000000005vi-0000-D +Data file written for message 10HmbG-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmbG-0005vi-00 + id 10HmbG-000000005vi-0000 for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss -SMTP>> 250 OK id=10HmbG-0005vi-00 +SMTP>> 250 OK id=10HmbG-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection @@ -223,13 +223,13 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D -Data file written for message 10HmbH-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbH-000000005vi-0000-D +Data file written for message 10HmbH-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmbH-0005vi-00 + id 10HmbH-000000005vi-0000 for warn_user@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: @@ -237,7 +237,7 @@ P Received: from [V4NET.9.8.7] (helo=test) >> LOG: MAIN <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss -SMTP>> 250 OK id=10HmbH-0005vi-00 +SMTP>> 250 OK id=10HmbH-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection @@ -407,7 +407,7 @@ LOG: MAIN frozen by ACL LOG: MAIN <= CALLER@test.ex U=CALLER P=local-smtp S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 LOG: MAIN *> accept <accept@y> R=accept T=appendfile LOG: MAIN @@ -418,7 +418,7 @@ LOG: delay_delivery MAIN no immediate delivery: queued by ACL LOG: MAIN <= CALLER@test.ex U=CALLER P=local-smtp S=sss -delivering 10HmbA-0005vi-00 +delivering 10HmbA-000000005vi-0000 LOG: MAIN *> accept <accept@y> R=accept T=appendfile LOG: MAIN diff --git a/test/stderr/0026 b/test/stderr/0026 index 9c780e2a1..5ab7d4da7 100644 --- a/test/stderr/0026 +++ b/test/stderr/0026 @@ -23,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=(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 +53,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 diff --git a/test/stderr/0038 b/test/stderr/0038 index 74050591d..204335401 100644 --- a/test/stderr/0038 +++ b/test/stderr/0038 @@ -38,11 +38,11 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit= >>> ratelimit found pre-computed rate 1.0 >>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period >>> warn: condition test succeeded in ACL "check_data" -LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h +LOG: 10HmaX-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h >>> processing "deny" (TESTSUITE/test-config 51) >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA +LOG: 10HmaX-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -82,11 +82,11 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit= >>> ratelimit found pre-computed rate 2.0 >>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period >>> warn: condition test succeeded in ACL "check_data" -LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h +LOG: 10HmaY-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h >>> processing "deny" (TESTSUITE/test-config 51) >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA +LOG: 10HmaY-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -127,11 +127,11 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit= >>> ratelimit found pre-computed rate 1.0 >>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period >>> warn: condition test succeeded in ACL "check_data" -LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h +LOG: 10HmaZ-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h >>> processing "deny" (TESTSUITE/test-config 51) >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA +LOG: 10HmaZ-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -171,11 +171,11 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=2.0 sender_rate_limit= >>> ratelimit found pre-computed rate 2.0 >>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period >>> warn: condition test succeeded in ACL "check_data" -LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h +LOG: 10HmbA-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=2.0 sender_rate_limit=0 sender_rate_period=1h >>> processing "deny" (TESTSUITE/test-config 51) >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA +LOG: 10HmbA-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -244,11 +244,11 @@ LOG: H=(test.ex) [V4NET.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit= >>> ratelimit computed rate 3.0 >>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period >>> warn: condition test succeeded in ACL "check_data" -LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=3.0 sender_rate_limit=0 sender_rate_period=1h +LOG: 10HmbB-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] Warning: DATA: sender_rate=3.0 sender_rate_limit=0 sender_rate_period=1h >>> processing "deny" (TESTSUITE/test-config 51) >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA +LOG: 10HmbB-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -312,8 +312,8 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> ratelimit computed rate 19.0 >>> l_message: DATA: sender_rate=$sender_rate sender_rate_limit=$sender_rate_limit sender_rate_period=$sender_rate_period >>> warn: condition test succeeded in ACL "check_data" -LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h +LOG: 10HmbC-000000005vi-0000 H=(test.ex) [V4NET.9.8.6] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h >>> processing "deny" (TESTSUITE/test-config 51) >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbC-0005vi-00 H=(test.ex) [V4NET.9.8.6] F=<> rejected after DATA +LOG: 10HmbC-000000005vi-0000 H=(test.ex) [V4NET.9.8.6] F=<> rejected after DATA diff --git a/test/stderr/0039 b/test/stderr/0039 index 7d8121912..e695fd503 100644 --- a/test/stderr/0039 +++ b/test/stderr/0039 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN *> newr1@myhost.test.ex <r1@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0] C="delivery bypassed by -N option" LOG: MAIN @@ -9,7 +9,7 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@qd.text.ex U=CALLER P=local S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 LOG: MAIN *> newr1@qd.text.ex <r1@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0] C="delivery bypassed by -N option" LOG: MAIN diff --git a/test/stderr/0044 b/test/stderr/0044 index b4ff34a26..efb5dd810 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -152,18 +152,18 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.11.12.13] (helo=exim.test.ex) by the.local.host.name with esmtp (Exim x.yz) (envelope-from <postmaster@exim.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 the.local.host.name closing connection @@ -213,7 +213,7 @@ search_tidyup called >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss +LOG: 10HmaY-000000005vi-0000 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 diff --git a/test/stderr/0055 b/test/stderr/0055 index 060d5626d..6f20ee130 100644 --- a/test/stderr/0055 +++ b/test/stderr/0055 @@ -1,11 +1,11 @@ LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN ** xxx@unknown.test.ex: unknown.test.ex is not local, and can't route by DNS LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -delivering 10HmaY-0005vi-00 + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss +delivering 10HmaY-000000005vi-0000 LOG: MAIN *> CALLER <CALLER@myhost.ex> R=localuser T=local_delivery LOG: MAIN @@ -14,24 +14,24 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss -delivering 10HmaZ-0005vi-00 +delivering 10HmaZ-000000005vi-0000 LOG: retry_defer MAIN == xxx@local.test.ex routing defer (-56): domain is in queue_domains LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss -delivering 10HmbB-0005vi-00 +delivering 10HmbB-000000005vi-0000 LOG: MAIN *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss -delivering 10HmbC-0005vi-00 +delivering 10HmbC-000000005vi-0000 LOG: MAIN == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue LOG: queue_run MAIN Start queue run: pid=p1236 -delivering 10HmbC-0005vi-00 (queue run pid p1236) +delivering 10HmbC-000000005vi-0000 (queue run pid p1236) LOG: MAIN *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" LOG: MAIN @@ -40,14 +40,14 @@ LOG: queue_run MAIN End queue run: pid=p1236 LOG: queue_run MAIN Start queue run: pid=p1237 -qq -delivering 10HmbD-0005vi-00 (queue run pid p1237) -delivering 10HmbE-0005vi-00 (queue run pid p1237) -delivering 10HmbD-0005vi-00 (queue run pid p1237) +delivering 10HmbD-000000005vi-0000 (queue run pid p1237) +delivering 10HmbE-000000005vi-0000 (queue run pid p1237) +delivering 10HmbD-000000005vi-0000 (queue run pid p1237) LOG: MAIN *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN Completed -delivering 10HmbE-0005vi-00 (queue run pid p1237) +delivering 10HmbE-000000005vi-0000 (queue run pid p1237) LOG: MAIN *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN @@ -56,20 +56,20 @@ LOG: queue_run MAIN End queue run: pid=p1237 -qq LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss -delivering 10HmbF-0005vi-00 +delivering 10HmbF-000000005vi-0000 LOG: MAIN == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue -delivering 10HmbF-0005vi-00 +delivering 10HmbF-000000005vi-0000 LOG: MAIN *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss -delivering 10HmbG-0005vi-00 +delivering 10HmbG-000000005vi-0000 LOG: retry_defer MAIN == xxx@local.test.ex routing defer (-56): domain is in queue_domains -delivering 10HmbG-0005vi-00 +delivering 10HmbG-000000005vi-0000 LOG: MAIN *> xxx@local.test.ex R=localreally T=local_delivery LOG: MAIN diff --git a/test/stderr/0056 b/test/stderr/0056 index f7af1bb98..687b05ec9 100644 --- a/test/stderr/0056 +++ b/test/stderr/0056 @@ -63,4 +63,4 @@ >>> 3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0057 b/test/stderr/0057 index 902d8207e..341a5dbdf 100644 --- a/test/stderr/0057 +++ b/test/stderr/0057 @@ -96,4 +96,4 @@ LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@ >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0058 b/test/stderr/0058 index ccd4bb494..68f177820 100644 --- a/test/stderr/0058 +++ b/test/stderr/0058 @@ -31,7 +31,7 @@ >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check domains = +local_domains @@ -50,4 +50,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smt >>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached) >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0059 b/test/stderr/0059 index 97765a8b0..327ce7f7b 100644 --- a/test/stderr/0059 +++ b/test/stderr/0059 @@ -55,4 +55,4 @@ >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss diff --git a/test/stderr/0060 b/test/stderr/0060 index d0eb28dd3..39ea365ce 100644 --- a/test/stderr/0060 +++ b/test/stderr/0060 @@ -58,7 +58,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -128,7 +128,7 @@ MUNGED: ::1 will be omitted in what follows >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -194,7 +194,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -260,7 +260,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smtp S=sss +LOG: 10HmbA-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -318,7 +318,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smt >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=smtp S=sss +LOG: 10HmbB-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -377,7 +377,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=s >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=smtp S=sss +LOG: 10HmbC-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -437,7 +437,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=s >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=smtp S=sss +LOG: 10HmbD-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -498,4 +498,4 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=s >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.4] P=smtp S=sss +LOG: 10HmbE-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.255.0.4] P=smtp S=sss diff --git a/test/stderr/0061 b/test/stderr/0061 index 3e53bc47a..7e04644e2 100644 --- a/test/stderr/0061 +++ b/test/stderr/0061 @@ -54,7 +54,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -115,4 +115,4 @@ MUNGED: ::1 will be omitted in what follows >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0062 b/test/stderr/0062 index 878ae5dbc..b9cf69bf5 100644 --- a/test/stderr/0062 +++ b/test/stderr/0062 @@ -65,7 +65,7 @@ LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejecte >>> processing "accept" (TESTSUITE/test-config 29) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -128,7 +128,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> processing "accept" (TESTSUITE/test-config 29) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -195,4 +195,4 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NE >>> processing "accept" (TESTSUITE/test-config 29) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=ten-3.test.ex (test) [V4NET.0.0.3] P=smtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@somehost.example.com H=ten-3.test.ex (test) [V4NET.0.0.3] P=smtp S=sss diff --git a/test/stderr/0063 b/test/stderr/0063 index fb37af469..5b2755f0a 100644 --- a/test/stderr/0063 +++ b/test/stderr/0063 @@ -60,7 +60,7 @@ >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -119,4 +119,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0064 b/test/stderr/0064 index 7c5f9785f..97637d627 100644 --- a/test/stderr/0064 +++ b/test/stderr/0064 @@ -60,7 +60,7 @@ >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -119,4 +119,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0065 b/test/stderr/0065 index 40d4d4002..29f3ffb75 100644 --- a/test/stderr/0065 +++ b/test/stderr/0065 @@ -51,7 +51,7 @@ >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -110,7 +110,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S= >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -166,7 +166,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S= >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -229,7 +229,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S= >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss +LOG: 10HmbA-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -286,7 +286,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S= >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss +LOG: 10HmbB-000000005vi-0000 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -344,7 +344,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smt >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss +LOG: 10HmbC-000000005vi-0000 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -403,4 +403,4 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=sm >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [192.153.98.4] P=smtp S=sss +LOG: 10HmbD-000000005vi-0000 <= userx@somehost.example.com H=(test) [192.153.98.4] P=smtp S=sss diff --git a/test/stderr/0066 b/test/stderr/0066 index 8537054c8..f8857bdfa 100644 --- a/test/stderr/0066 +++ b/test/stderr/0066 @@ -58,7 +58,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -123,7 +123,7 @@ MUNGED: ::1 will be omitted in what follows >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -184,7 +184,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -252,7 +252,7 @@ LOG: no host name found for IP address 1.3.2.4 >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss +LOG: 10HmbA-000000005vi-0000 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -313,7 +313,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss +LOG: 10HmbB-000000005vi-0000 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -374,7 +374,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss +LOG: 10HmbC-000000005vi-0000 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -440,7 +440,7 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss +LOG: 10HmbD-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -501,7 +501,7 @@ MUNGED: ::1 will be omitted in what follows >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted -LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.11.12.13] P=smtp S=sss +LOG: 10HmbE-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.11.12.13] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -561,4 +561,4 @@ MUNGED: ::1 will be omitted in what follows >>> host in "+relay_hosts"? yes (matched "+relay_hosts") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmbF-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.3] P=smtp S=sss +LOG: 10HmbF-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.3] P=smtp S=sss diff --git a/test/stderr/0079 b/test/stderr/0079 index 710c7da01..0ce7d257f 100644 --- a/test/stderr/0079 +++ b/test/stderr/0079 @@ -103,4 +103,4 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: accepting postmaster from host i >>> end of ACL "check_recipient": DENY LOG: H=(exim.test.ex) [V4NET.11.12.14] F=<postmaster@exim.test.ex> rejected RCPT list@exim.test.ex: host is listed in rbl2.test.ex >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmbB-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss +LOG: 10HmbB-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss diff --git a/test/stderr/0080 b/test/stderr/0080 index ffed589d3..e69ce1df2 100644 --- a/test/stderr/0080 +++ b/test/stderr/0080 @@ -46,4 +46,4 @@ >>> end of ACL "check_recipient": DENY LOG: H=(exim.test.ex) [V4NET.11.12.14] F=<postmaster@exim.test.ex> rejected RCPT list@exim.test.ex: host is listed in rbl.test.ex >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss +LOG: 10HmaX-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss diff --git a/test/stderr/0081 b/test/stderr/0081 index f8bb872ae..a67945c70 100644 --- a/test/stderr/0081 +++ b/test/stderr/0081 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@exim.test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 >This is the first text. This is the second text. This is the third text. diff --git a/test/stderr/0086 b/test/stderr/0086 index bc1d1aba6..ad5234ec9 100644 --- a/test/stderr/0086 +++ b/test/stderr/0086 @@ -21,10 +21,10 @@ >>> check !verify = header_syntax >>> check logwrite = acl_verify_message: '$acl_verify_message' >>> = acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' -LOG: 10HmaY-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' +LOG: 10HmaY-000000005vi-0000 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z +LOG: 10HmaY-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -48,10 +48,10 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> check !verify = header_syntax >>> check logwrite = acl_verify_message: '$acl_verify_message' >>> = acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' -LOG: 10HmaZ-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' +LOG: 10HmaZ-000000005vi-0000 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z +LOG: 10HmaZ-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -75,10 +75,10 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> check !verify = header_syntax >>> check logwrite = acl_verify_message: '$acl_verify_message' >>> = acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d' -LOG: 10HmbA-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d' +LOG: 10HmbA-000000005vi-0000 acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d +LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -102,10 +102,10 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> check !verify = header_syntax >>> check logwrite = acl_verify_message: '$acl_verify_message' >>> = acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre' -LOG: 10HmbB-0005vi-00 acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre' +LOG: 10HmbB-000000005vi-0000 acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre +LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addresses.addresses.addresses, \n longlonglonglonglong@long.long.long.long.long.long.long.long,\n listlistlistlistlist@list.list.list.list.list.list.list.list,\n ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n addressesaddresses@addresses.addre >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -129,10 +129,10 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> check !verify = header_syntax >>> check logwrite = acl_verify_message: '$acl_verify_message' >>> = acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>' -LOG: 10HmbC-0005vi-00 acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>' +LOG: 10HmbC-000000005vi-0000 acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>' >>> deny: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": DENY -LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd> +LOG: 10HmbC-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -158,4 +158,4 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> processing "accept" (TESTSUITE/test-config 21) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.9] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.9] P=smtp S=sss diff --git a/test/stderr/0087 b/test/stderr/0087 index 9b29e9864..1226a7dfd 100644 --- a/test/stderr/0087 +++ b/test/stderr/0087 @@ -51,7 +51,7 @@ >>> 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@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -105,7 +105,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> 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@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -165,7 +165,7 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -229,7 +229,7 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after >>> 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@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -287,4 +287,4 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> defer router: defer for defer@test.ex >>> message: this is a forced defer >>> require: condition test deferred in ACL "check_message" -LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred +LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred diff --git a/test/stderr/0091 b/test/stderr/0091 index 6bb9ac04b..3efd8b6c8 100644 --- a/test/stderr/0091 +++ b/test/stderr/0091 @@ -40,7 +40,7 @@ >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmaY-000000005vi-0000 H=(test) [V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after DATA: there is no valid sender in any header line >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -122,7 +122,7 @@ LOG: H=(test) [V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test. >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmaZ-000000005vi-0000 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -177,4 +177,4 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DA >>> processing "accept" (TESTSUITE/test-config 25) >>> accept: condition test succeeded in ACL "check_message" >>> end of ACL "check_message": ACCEPT -LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.0.0.2] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [V4NET.0.0.2] P=smtp S=sss diff --git a/test/stderr/0108 b/test/stderr/0108 index 489565dec..c7d9e8e86 100644 --- a/test/stderr/0108 +++ b/test/stderr/0108 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN *> xx@black.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN @@ -13,7 +13,7 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 LOG: MAIN *> xx@black.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN diff --git a/test/stderr/0121 b/test/stderr/0121 index b3c58bfc8..8e6e33d1c 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -130,7 +130,7 @@ LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx >>> no more routers >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line +LOG: 10HmaX-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -169,7 +169,7 @@ LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA >>> verifying From: header address <> >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmaY-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>" +LOG: 10HmaY-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>" >>> using ACL "check_recipient" >>> processing "require" (TESTSUITE/test-config 21) >>> check verify = sender @@ -242,7 +242,7 @@ LOG: H=(test) [127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@tes >>> defer router: defer for defer@test.ex >>> message: forced defer >>> require: condition test deferred in ACL "check_message" -LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred +LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) diff --git a/test/stderr/0138 b/test/stderr/0138 index 81f35c3d7..9bea4c4f1 100644 --- a/test/stderr/0138 +++ b/test/stderr/0138 @@ -60,7 +60,7 @@ >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss +LOG: 10HmaX-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -160,4 +160,4 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss +LOG: 10HmaY-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss diff --git a/test/stderr/0139 b/test/stderr/0139 index 9e55b4934..a329e1ce5 100644 --- a/test/stderr/0139 +++ b/test/stderr/0139 @@ -143,7 +143,7 @@ >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) diff --git a/test/stderr/0143 b/test/stderr/0143 index 9feb83a4b..c6ff94fe7 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -19,7 +19,7 @@ hostlist: '127.0.0.1' IP 127.0.0.1 port -1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@domain.com) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/0158 b/test/stderr/0158 index 59ee740af..edc1cbf51 100644 --- a/test/stderr/0158 +++ b/test/stderr/0158 @@ -1,3 +1,3 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 unable to set gid=CALLER_GID or uid=CALLER_UID (euid=EXIM_UID): local delivery to CALLER <CALLER@test.ex> transport=local_delivery -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to read delivery status for CALLER@test.ex from delivery subprocess -1999-03-02 09:44:33 10HmaX-0005vi-00 appendfile transport process returned non-zero status 0x0100: exit code 1 +1999-03-02 09:44:33 10HmaX-000000005vi-0000 unable to set gid=CALLER_GID or uid=CALLER_UID (euid=EXIM_UID): local delivery to CALLER <CALLER@test.ex> transport=local_delivery +1999-03-02 09:44:33 10HmaX-000000005vi-0000 failed to read delivery status for CALLER@test.ex from delivery subprocess +1999-03-02 09:44:33 10HmaX-000000005vi-0000 appendfile transport process returned non-zero status 0x0100: exit code 1 diff --git a/test/stderr/0170 b/test/stderr/0170 index 8f2cfcf0d..eae28c42d 100644 --- a/test/stderr/0170 +++ b/test/stderr/0170 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == |/source/exim4/AutoTest/non-exist <system-filter> routing defer (-1): system_filter_pipe_transport is unset +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == |/source/exim4/AutoTest/non-exist <system-filter> routing defer (-1): system_filter_pipe_transport is unset diff --git a/test/stderr/0175 b/test/stderr/0175 index cc6af4105..b45971a07 100644 --- a/test/stderr/0175 +++ b/test/stderr/0175 @@ -137,4 +137,4 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss diff --git a/test/stderr/0177 b/test/stderr/0177 index cf152d1eb..9d3f82b4f 100644 --- a/test/stderr/0177 +++ b/test/stderr/0177 @@ -1,24 +1,24 @@ -10HmaX-0005vi-00 "fail this" first delivery -10HmaX-0005vi-00 subject is not "Fail This" -10HmaY-0005vi-00 "auto fail message" first delivery -10HmaZ-0005vi-00 "Mail delivery failed: returning message to sender" first delivery -10HmbA-0005vi-00 "freeze this (1)" first delivery -10HmbA-0005vi-00 subject is not "Fail This" -10HmbB-0005vi-00 "auto freeze message" first delivery -10HmbC-0005vi-00 "reply to this" first delivery -10HmbC-0005vi-00 subject is not "Fail This" -10HmbD-0005vi-00 "An auto reply: qualify_domain=test.ex" first delivery -10HmbA-0005vi-00 "freeze this (1)" not first delivery -10HmbA-0005vi-00 subject is not "Fail This" -10HmbE-0005vi-00 "freeze this (2)" first delivery -10HmbE-0005vi-00 subject is not "Fail This" -10HmbF-0005vi-00 "auto freeze message" first delivery -10HmbE-0005vi-00 "freeze this (2)" not first delivery -10HmbE-0005vi-00 subject is not "Fail This" -10HmbG-0005vi-00 "freeze this (3)" first delivery -10HmbG-0005vi-00 subject is not "Fail This" -10HmbH-0005vi-00 "auto freeze message" first delivery -10HmbG-0005vi-00 "freeze this (3)" not first delivery -10HmbG-0005vi-00 subject is not "Fail This" -10HmbG-0005vi-00 "freeze this (3)" not first delivery -10HmbG-0005vi-00 subject is not "Fail This" +10HmaX-000000005vi-0000 "fail this" first delivery +10HmaX-000000005vi-0000 subject is not "Fail This" +10HmaY-000000005vi-0000 "auto fail message" first delivery +10HmaZ-000000005vi-0000 "Mail delivery failed: returning message to sender" first delivery +10HmbA-000000005vi-0000 "freeze this (1)" first delivery +10HmbA-000000005vi-0000 subject is not "Fail This" +10HmbB-000000005vi-0000 "auto freeze message" first delivery +10HmbC-000000005vi-0000 "reply to this" first delivery +10HmbC-000000005vi-0000 subject is not "Fail This" +10HmbD-000000005vi-0000 "An auto reply: qualify_domain=test.ex" first delivery +10HmbA-000000005vi-0000 "freeze this (1)" not first delivery +10HmbA-000000005vi-0000 subject is not "Fail This" +10HmbE-000000005vi-0000 "freeze this (2)" first delivery +10HmbE-000000005vi-0000 subject is not "Fail This" +10HmbF-000000005vi-0000 "auto freeze message" first delivery +10HmbE-000000005vi-0000 "freeze this (2)" not first delivery +10HmbE-000000005vi-0000 subject is not "Fail This" +10HmbG-000000005vi-0000 "freeze this (3)" first delivery +10HmbG-000000005vi-0000 subject is not "Fail This" +10HmbH-000000005vi-0000 "auto freeze message" first delivery +10HmbG-000000005vi-0000 "freeze this (3)" not first delivery +10HmbG-000000005vi-0000 subject is not "Fail This" +10HmbG-000000005vi-0000 "freeze this (3)" not first delivery +10HmbG-000000005vi-0000 subject is not "Fail This" diff --git a/test/stderr/0185 b/test/stderr/0185 index f68974531..67317a0d3 100644 --- a/test/stderr/0185 +++ b/test/stderr/0185 @@ -1,3 +1,3 @@ -10HmaX-0005vi-00 "freeze this" first delivery -10HmaX-0005vi-00 "freeze this" not first delivery -10HmaX-0005vi-00 "freeze this" not first delivery +10HmaX-000000005vi-0000 "freeze this" first delivery +10HmaX-000000005vi-0000 "freeze this" not first delivery +10HmaX-000000005vi-0000 "freeze this" not first delivery diff --git a/test/stderr/0204 b/test/stderr/0204 index 4f4091dee..ebc7df2b8 100644 --- a/test/stderr/0204 +++ b/test/stderr/0204 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN *> userx <userx@test.ex> R=abc T=local_delivery LOG: MAIN diff --git a/test/stderr/0217 b/test/stderr/0217 index 1aac31e4c..f78a7d118 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmbL-0005vi-00 +delivering 10HmbL-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -823,8 +823,8 @@ LOG: MAIN LOG: MAIN ** n199@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: 550 NO LOG: MAIN - <= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss -delivering 10HmbM-0005vi-00 + <= <> R=10HmbL-000000005vi-0000 U=EXIMUSER P=local S=sss +delivering 10HmbM-000000005vi-0000 LOG: MAIN ** CALLER@test.ex R=bounce: just discard LOG: MAIN @@ -833,7 +833,7 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmbP-0005vi-00 +delivering 10HmbP-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/0218 b/test/stderr/0218 index abba84e9f..43c39ff22 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -7,17 +7,17 @@ LOG: queue_run MAIN Start queue run: pid=p1234 -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid p1234) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmaY-0005vi-00 (queue run pid p1234) +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid p1234) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -46,7 +46,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 (queue run pid p1234) +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) R: client (ACL) T: send_to_server (ACL) SMTP|> MAIL FROM:<CALLER@test.ex> @@ -80,17 +80,17 @@ LOG: queue_run MAIN Start queue run: pid=p1235 -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid p1235) +delivering 10HmaZ-000000005vi-0000 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid p1235) +delivering 10HmbA-000000005vi-0000 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid p1235) +delivering 10HmaZ-000000005vi-0000 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -116,12 +116,12 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1243 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid p1235) +delivering 10HmbA-000000005vi-0000 (queue run pid p1235) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused @@ -139,11 +139,11 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=p1236 -qqf -delivering 10HmbA-0005vi-00 (queue run pid p1236) +delivering 10HmbA-000000005vi-0000 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1246 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbB-0005vi-00 (queue run pid p1236) +delivering 10HmbB-000000005vi-0000 (queue run pid p1236) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -152,11 +152,11 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1247 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbC-0005vi-00 (queue run pid p1236) +delivering 10HmbC-000000005vi-0000 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=p1248 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid p1236) +delivering 10HmbA-000000005vi-0000 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected @@ -181,7 +181,7 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmbA-000000005vi-0000 U=EXIMUSER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1249 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed @@ -191,7 +191,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbC-0005vi-00 (queue run pid p1236) +delivering 10HmbC-000000005vi-0000 (queue run pid p1236) R: client (ACL) T: send_to_server (ACL) SMTP|> MAIL FROM:<CALLER@test.ex> diff --git a/test/stderr/0241 b/test/stderr/0241 index 60694afb2..36193c3ef 100644 --- a/test/stderr/0241 +++ b/test/stderr/0241 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory -1999-03-02 09:44:33 10HmaX-0005vi-00 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory +1999-03-02 09:44:33 10HmaX-000000005vi-0000 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory +1999-03-02 09:44:33 10HmaX-000000005vi-0000 re-exec of exim (TESTSUITE/eximdir/exim/junk) with -odi failed: Not a directory diff --git a/test/stderr/0260 b/test/stderr/0260 index 7c438430d..0337b7807 100644 --- a/test/stderr/0260 +++ b/test/stderr/0260 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" -1999-03-02 09:44:33 10HmaX-0005vi-00 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" -1999-03-02 09:44:33 10HmaX-0005vi-00 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" -1999-03-02 09:44:33 10HmaX-0005vi-00 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 Failed to expand return path "${if" in bad_return transport: condition name expected, but found "" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 home directory "${if rhubarb" failed to expand for exp_fail transport: unknown condition "rhubarb" diff --git a/test/stderr/0261 b/test/stderr/0261 index a8bff050c..50f388301 100644 --- a/test/stderr/0261 +++ b/test/stderr/0261 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN PANIC == bad.return@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" LOG: MAIN PANIC @@ -9,6 +9,6 @@ LOG: MAIN PANIC == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set LOG: MAIN *> userx@test.ex R=good T=remote_delivery H=V4NET.0.0.1 [V4NET.0.0.1] C="delivery bypassed by -N option" -1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" -1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" -1999-03-02 09:44:33 10HmaX-0005vi-00 == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == bad.return@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == bad.return2@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found "" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set diff --git a/test/stderr/0264 b/test/stderr/0264 index 5d7324c18..8a7b911e2 100644 --- a/test/stderr/0264 +++ b/test/stderr/0264 @@ -1,9 +1,9 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss Exim version x.yz .... @@ -11,9 +11,9 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbJ-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmbJ-0005vi-00-D -reading spool file 10HmbJ-0005vi-00-H +delivering 10HmbJ-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmbJ-000000005vi-0000-D +reading spool file 10HmbJ-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -88,12 +88,12 @@ Writing retry data for R:outside first failed=dddd last try=dddd next try=+300 expired=0 errno=-1 more_errno=dd not just now end of retry processing -time on queue = 0s id 10HmbJ-0005vi-00 addr rz.b@outside +time on queue = 0s id 10HmbJ-000000005vi-0000 addr rz.b@outside warning counts: required 0 done 0 delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H -end delivery of 10HmbJ-0005vi-00 +Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H +end delivery of 10HmbJ-000000005vi-0000 >>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0275 b/test/stderr/0275 index 46fdda55d..f59b6aac8 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -211,27 +211,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 @@ -242,9 +242,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -467,7 +467,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -485,7 +485,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1236 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -502,7 +502,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0276 b/test/stderr/0276 index 2b7158465..4e98a6c84 100644 --- a/test/stderr/0276 +++ b/test/stderr/0276 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -21,8 +21,8 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:500:QUIT:200' LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -delivering 10HmaY-0005vi-00 + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss +delivering 10HmaY-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused @@ -38,7 +38,7 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaZ-0005vi-00 +delivering 10HmaZ-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -58,8 +58,8 @@ cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:500:QUIT:200' LOG: MAIN ** usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO LOG: MAIN - <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss -delivering 10HmbA-0005vi-00 + <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss +delivering 10HmbA-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused diff --git a/test/stderr/0278 b/test/stderr/0278 index 4cacfefbb..c5b926186 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -116,27 +116,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 @@ -147,9 +147,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -267,7 +267,7 @@ search_tidyup called changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=CALLER_HOME current=CALLER_HOME -set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to CALLER using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -285,7 +285,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1236 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: CALLER@test.ex: no retry items @@ -302,7 +302,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0283 b/test/stderr/0283 index 8a8d45165..a41907c73 100644 --- a/test/stderr/0283 +++ b/test/stderr/0283 @@ -49,7 +49,7 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg LOG: MAIN - <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaY-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 diff --git a/test/stderr/0292 b/test/stderr/0292 index f88c6b03c..8695f117a 100644 --- a/test/stderr/0292 +++ b/test/stderr/0292 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 $host=host.1:host.2 $host_address= LOG: MAIN *> userx@t1 R=r1 T=t1 H=host.1:host.2 diff --git a/test/stderr/0293 b/test/stderr/0293 index 4a1ab718a..f53dae379 100644 --- a/test/stderr/0293 +++ b/test/stderr/0293 @@ -2,7 +2,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN <= x1@y U=CALLER P=local-smtp S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN => one <one@z> R=r1 T=t1 LOG: MAIN diff --git a/test/stderr/0294 b/test/stderr/0294 index 6dac79140..afffd2f51 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -33,25 +33,25 @@ SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 smtp_setup_msg entered SMTP<< mail from:<x@y> rate limit MAIL: delay 1 sec @@ -65,25 +65,25 @@ SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for two@z; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 smtp_setup_msg entered SMTP<< mail from:<x@y> rate limit MAIL: delay 2 sec diff --git a/test/stderr/0297 b/test/stderr/0297 index 183f92144..b902d1b1f 100644 --- a/test/stderr/0297 +++ b/test/stderr/0297 @@ -48,7 +48,7 @@ routed by r1 router >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN <= fil@ter U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN original recipients ignored (system filter) LOG: MAIN @@ -57,7 +57,7 @@ LOG: MAIN Completed LOG: MAIN <= fil@ter U=CALLER P=local S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 LOG: MAIN original recipients ignored (system filter) LOG: MAIN @@ -66,7 +66,7 @@ LOG: MAIN Completed LOG: MAIN <= fil@ter U=CALLER P=local S=sss -delivering 10HmaZ-0005vi-00 +delivering 10HmaZ-000000005vi-0000 LOG: MAIN original recipients ignored (system filter) LOG: MAIN @@ -75,7 +75,7 @@ LOG: MAIN Completed LOG: MAIN <= fil@ter U=CALLER P=local S=sss -delivering 10HmbA-0005vi-00 +delivering 10HmbA-000000005vi-0000 LOG: MAIN original recipients ignored (system filter) LOG: MAIN diff --git a/test/stderr/0303 b/test/stderr/0303 index 6c8b6a5d8..6eb387a34 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -113,17 +113,17 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.2.3.4] by myhost.test.ex with esmtp (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection @@ -193,17 +193,17 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from host.name.tld ([V4NET.2.3.4]) by myhost.test.ex with esmtp (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection diff --git a/test/stderr/0315 b/test/stderr/0315 index 7b4103034..4dc506af4 100644 --- a/test/stderr/0315 +++ b/test/stderr/0315 @@ -9,7 +9,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -67,7 +67,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/0317 b/test/stderr/0317 index 660a39d28..aaa9efce6 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -15,19 +15,19 @@ Bcc: p@q.r T To: x@y.z C Cc: a@b.c * Bcc: p@q.r -I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -51,7 +51,7 @@ Resent-bcc: xx@yy.zz >>Headers after rewriting and local additions: Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex> +I Resent-Message-Id: <E10HmaY-000000005vi-0000@mail.test.ex> T To: x@y.z C Cc: a@b.c B Bcc: p@q.r @@ -60,15 +60,15 @@ C Resent-cc: pp@qq.rr * Resent-bcc: xx@yy.zz F Resent-From: CALLER_NAME <CALLER@test.ex> -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0353 b/test/stderr/0353 index 354e6678f..1f2d9cf55 100644 --- a/test/stderr/0353 +++ b/test/stderr/0353 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: "non/absolute/file" is not an absolute path +1999-03-02 09:44:33 10HmaX-000000005vi-0000 Error in system filter: "non/absolute/file" is not an absolute path diff --git a/test/stderr/0354 b/test/stderr/0354 index beb6e0b99..839d9f1d8 100644 --- a/test/stderr/0354 +++ b/test/stderr/0354 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: "non-absolute-file" is not an absolute path +1999-03-02 09:44:33 10HmaX-000000005vi-0000 Error in system filter: "non-absolute-file" is not an absolute path diff --git a/test/stderr/0360 b/test/stderr/0360 index 918a440ed..7e30058bc 100644 --- a/test/stderr/0360 +++ b/test/stderr/0360 @@ -9,7 +9,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/0361 b/test/stderr/0361 index c040548cb..6ae3012bd 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN *> miles <miles@thishost.test.ex> R=r4 T=t2 LOG: MAIN @@ -32,26 +32,26 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +I Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -62,9 +62,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -238,7 +238,7 @@ search_tidyup called changed uid/gid: local delivery to kilos <kilos@recurse.test.ex.test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to kilos using t2 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to kilos using t2 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -259,7 +259,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 DSN: processing router : r4 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex DSN: Sender_address: CALLER@test.ex @@ -278,7 +278,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0371 b/test/stderr/0371 index 4669445d0..9105d6473 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -87,13 +87,13 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.0.0.0] (helo=something) by mail.test.ex with esmtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "data" @@ -106,7 +106,7 @@ accept: condition test succeeded in ACL "data" end of ACL "data": ACCEPT LOG: MAIN <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 smtp_setup_msg entered SMTP<< vrfy x@y host in smtp_accept_max_nonmail_hosts? diff --git a/test/stderr/0372 b/test/stderr/0372 index 70b08f031..c49d7138a 100644 --- a/test/stderr/0372 +++ b/test/stderr/0372 @@ -2,7 +2,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 ----- System filter ----- acl_c0="value for c0 is ip: 1.2.3.4" acl_c1="" @@ -63,7 +63,7 @@ LOG: MAIN Completed LOG: MAIN <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss -delivering 10HmaZ-0005vi-00 +delivering 10HmaZ-000000005vi-0000 ----- System filter ----- acl_c0="value for c0 is ip: 1.2.3.4" acl_c1="" @@ -123,6 +123,6 @@ LOG: MAIN LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT ----- System filter ----- -1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand " acl_c0="$acl_c0"\n acl_c1="$acl_c1"\n acl_c2="$acl_c2"\n acl_c3="$acl_c3"\n acl_c4="$acl_c4"\n acl_c5="$acl_c5"\n acl_c6="$acl_c6"\n acl_c7="$acl_c7"\n acl_c8="$acl_c8"\n acl_c9="$acl_c9"\n acl_m0="$acl_m0"\n acl_m1="$acl_m1"\n acl_m2="$acl_m2"\n acl_m3="$acl_m3"\n acl_m4="$acl_m4"\n acl_m5="$acl_m5"\n acl_m6="$acl_m6"\n acl_m7="$acl_m7"\n acl_m8="$acl_m8"\n acl_m9="$acl_m9"\n acl_m_foo="$acl_m_foo"\n acl_m_bar="$acl_m_bar"\n acl_c_foo="$acl_c_foo"\n acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set) +1999-03-02 09:44:33 10HmaX-000000005vi-0000 Error in system filter: failed to expand " acl_c0="$acl_c0"\n acl_c1="$acl_c1"\n acl_c2="$acl_c2"\n acl_c3="$acl_c3"\n acl_c4="$acl_c4"\n acl_c5="$acl_c5"\n acl_c6="$acl_c6"\n acl_c7="$acl_c7"\n acl_c8="$acl_c8"\n acl_c9="$acl_c9"\n acl_m0="$acl_m0"\n acl_m1="$acl_m1"\n acl_m2="$acl_m2"\n acl_m3="$acl_m3"\n acl_m4="$acl_m4"\n acl_m5="$acl_m5"\n acl_m6="$acl_m6"\n acl_m7="$acl_m7"\n acl_m8="$acl_m8"\n acl_m9="$acl_m9"\n acl_m_foo="$acl_m_foo"\n acl_m_bar="$acl_m_bar"\n acl_c_foo="$acl_c_foo"\n acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set) ******** SERVER ******** diff --git a/test/stderr/0374 b/test/stderr/0374 index a9b2c20e9..dc55b780a 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -385,7 +385,7 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0375 b/test/stderr/0375 index 5ef71ed20..138e9ecc9 100644 --- a/test/stderr/0375 +++ b/test/stderr/0375 @@ -849,7 +849,7 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0378 b/test/stderr/0378 index 2511ccbca..845da3cb2 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -119,7 +119,7 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0382 b/test/stderr/0382 index ad2abb495..6ab4d7465 100644 --- a/test/stderr/0382 +++ b/test/stderr/0382 @@ -20,7 +20,7 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0386 b/test/stderr/0386 index e6aeda9e2..40a9eb51b 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -259,28 +259,28 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for 2@b; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 @@ -293,9 +293,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = (test) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -356,7 +356,7 @@ search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to 2 using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 2 using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/2 format=unix @@ -385,7 +385,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1236 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: 2@b: no retry items @@ -402,7 +402,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -456,28 +456,28 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.11.12.13] (helo=test ident=CALLER) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for 2@b; Tue, 2 Mar 1999 09:44:33 +0000 >>Headers added by MAIL or RCPT ACL: X-Warning: V4NET.11.12.13 is listed at rbl.test.ex X-Warning: This is a test blacklisting message >> -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 @@ -490,9 +490,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = (test) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER) @@ -553,7 +553,7 @@ search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to 2 using t1 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to 2 using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/2 format=unix @@ -582,7 +582,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1238 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: 2@b: no retry items @@ -599,7 +599,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0388 b/test/stderr/0388 index f30f90774..30baccef2 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -5,7 +5,7 @@ configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY @@ -75,7 +75,7 @@ search_tidyup called search_tidyup called changed uid/gid: remote delivery to x@y with transport=smtp uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp +set_process_info: pppp delivering 10HmaX-000000005vi-0000 using smtp checking retry status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile @@ -84,7 +84,7 @@ checking retry status of 127.0.0.1 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available 127.0.0.1 in serialize_hosts? no (option unset) -set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen? list element: connected @@ -109,7 +109,7 @@ cmd buf flush ddd bytes (more expected) SMTP<< 250 OK SMTP(close)>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' -set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK +set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK *@127.0.0.1 in "*"? list element: * address match test: subject=*@127.0.0.1 pattern=* @@ -126,26 +126,26 @@ checking retry status of V4NET.0.0.0 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) -set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... V4NET.0.0.0 in hosts_try_fastopen? failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable -set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER +set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER added retry item for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2 -set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish -set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) +set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish +set_process_info: pppp delivering 10HmaX-000000005vi-0000 (just run smtp for x@y in subprocess) search_tidyup called reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S from subprocess added retry item reading retry information for R:x@y from subprocess added retry item -set_process_info: pppp delivering 10HmaX-0005vi-00 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 LOG: MAIN == x@y R=r1 T=smtp defer (dd): Network unreachable H=127.0.0.1 [127.0.0.1] changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1234 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: Failed addresses: @@ -191,7 +191,7 @@ LOG: MAIN EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 @@ -212,7 +212,7 @@ X-Failed-Recipients: x@y Auto-Submitted: auto-replied From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> To: CALLER@myhost.test.ex -References: <E10HmaX-0005vi-00@myhost.test.ex> +References: <E10HmaX-000000005vi-0000@myhost.test.ex> Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender @@ -230,27 +230,27 @@ search_tidyup called Auto-Submitted: auto-replied F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> T To: CALLER@myhost.test.ex - References: <E10HmaX-0005vi-00@myhost.test.ex> + References: <E10HmaX-000000005vi-0000@myhost.test.ex> Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 @@ -259,7 +259,7 @@ trusted user admin user dropping to exim gid; retaining priv uid set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY @@ -307,7 +307,7 @@ After routing: search_tidyup called changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1237 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: CALLER@myhost.test.ex: no retry items @@ -321,8 +321,8 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN Completed diff --git a/test/stderr/0402 b/test/stderr/0402 index 7c3913c5b..8d6f16f95 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -36,12 +36,12 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -347,7 +347,7 @@ Data file written for message 10HmaX-0005vi-00 ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaX-0005vi-00 + ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -374,28 +374,28 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ╰─────result: Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <usery@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <userz@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <rd+CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <rd+usery@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -413,9 +413,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -735,7 +735,7 @@ search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=/non-exist/usery current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered ╭considering: $address_file ├──────value: TESTSUITE/test-mail/junk @@ -816,7 +816,7 @@ search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=/non-exist/CALLER current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered ╭considering: $address_file ├──────value: TESTSUITE/test-mail/junk @@ -897,7 +897,7 @@ search_tidyup called changed uid/gid: local delivery to CALLER <CALLER@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1238 home=/non-exist/CALLER current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to CALLER using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -931,7 +931,7 @@ search_tidyup called changed uid/gid: local delivery to usery <usery@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1239 home=/non-exist/usery current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to usery using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to usery using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -965,7 +965,7 @@ search_tidyup called changed uid/gid: local delivery to userz <userz@test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=p1240 home=/userz current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userz using t2 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userz using t2 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -983,7 +983,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userz@test.ex: no retry items @@ -1056,7 +1056,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0403 b/test/stderr/0403 index e479b0c54..d231bffc3 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -25,27 +25,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -56,9 +56,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -169,7 +169,7 @@ search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=/usr current=/usr -set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail/junk using t1 +++TRANSPORT: +++domain_data=[DOMAINDATA_test.ex] +++local_part_data=[LOCALPARTDATA_userx] @@ -194,7 +194,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 DSN: processing router : r1 DSN: processing successful delivery address: TESTSUITE/test-mail/junk DSN: Sender_address: CALLER@test.ex @@ -213,7 +213,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0404 b/test/stderr/0404 index b3cccddcc..774121b92 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -124,27 +124,27 @@ R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@ **** debug string too long - truncated **** -I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -157,9 +157,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -247,10 +247,10 @@ search_tidyup called changed uid/gid: local delivery to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <>sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... using t1 t1 transport entered taking data from address -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 @@ -272,8 +272,8 @@ search_tidyup called >>Headers received: To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, **** debug string too long - truncated **** -In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex> -References: <E10HmaX-0005vi-00@mail.test.ex> +In-Reply-To: <E10HmaX-000000005vi-0000@mail.test.ex> +References: <E10HmaX-000000005vi-0000@mail.test.ex> Auto-Submitted: auto-replied qualify & rewrite recipients list @@ -288,20 +288,20 @@ search_tidyup called >>Headers after rewriting and local additions: T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.e **** debug string too long - truncated **** - In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex> - References: <E10HmaX-0005vi-00@mail.test.ex> + In-Reply-To: <E10HmaX-000000005vi-0000@mail.test.ex> + References: <E10HmaX-000000005vi-0000@mail.test.ex> Auto-Submitted: auto-replied -I Message-Id: <E10HmaY-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 @@ -910,12 +910,12 @@ DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> d DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1239 @@ -928,9 +928,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender= sender_local=1 ident=CALLER Non-recipients: @@ -18596,7 +18596,7 @@ search_tidyup called changed uid/gid: local delivery to sender <sender@test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to sender using t2 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to sender using t2 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/sender format=unix @@ -18627,7 +18627,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1239 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: sender@test.ex: no retry items @@ -18644,7 +18644,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -18662,7 +18662,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...: no retry items @@ -18689,7 +18689,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0408 b/test/stderr/0408 index af0759cab..7cbaefa0f 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -25,27 +25,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -56,9 +56,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -149,7 +149,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/userx format=unix @@ -178,7 +178,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -195,7 +195,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0426 b/test/stderr/0426 index c526fe9f1..0112cdc10 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -57,7 +57,7 @@ configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0450 b/test/stderr/0450 index 5c12aa414..997954187 100644 --- a/test/stderr/0450 +++ b/test/stderr/0450 @@ -17,14 +17,14 @@ using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused added retry item for T:127.0.0.1:127.0.0.1:PORT_D: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database -added 10HmaX-0005vi-00 to queue for 127.0.0.1 +added 10HmaX-000000005vi-0000 to queue for 127.0.0.1 Leaving t1 transport LOG: MAIN == userx@test.ex R=r1 T=t1 defer (dd): Connection refused @@ -46,7 +46,7 @@ checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1112 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused diff --git a/test/stderr/0465 b/test/stderr/0465 index 8bd50d1cb..c4be802bb 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -76,15 +76,15 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: T To: abc@domain. -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" @@ -92,14 +92,14 @@ processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax accept: condition test succeeded in ACL "check_data" end of ACL "check_data": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <abc@domain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= <> U=CALLER P=local-smtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection @@ -150,15 +150,15 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: T To: abc@xyz. -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_data" diff --git a/test/stderr/0467 b/test/stderr/0467 index b2aa2ef56..738a07f16 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -1,20 +1,20 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25 C="delivery bypassed by -N option" LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 LOG: MAIN *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88 C="delivery bypassed by -N option" LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaZ-0005vi-00 +delivering 10HmaZ-000000005vi-0000 Transport port=25 replaced by host-specific port=PORT_S Connecting to localhost.test.ex [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready diff --git a/test/stderr/0471 b/test/stderr/0471 index 9b1482ab7..9b214aa79 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -26858,16 +26858,16 @@ T To: random@rwtest.example, random@rwtest.example, **** debug string too long - truncated **** -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -26877,9 +26877,9 @@ warn: condition test failed in ACL "check" processing "accept" (TESTSUITE/test-config 17) accept: condition test succeeded in ACL "check" end of ACL "check": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <r1@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -27055,16 +27055,16 @@ search_tidyup called >>Headers after rewriting and local additions: * To: localpart_with_056_chars_56789012345678901234567890123456@test.example T To: deny_me@rwtest.example -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for r2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27074,9 +27074,9 @@ warn: condition test failed in ACL "check" processing "accept" (TESTSUITE/test-config 17) accept: condition test succeeded in ACL "check" end of ACL "check": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <r2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -27251,16 +27251,16 @@ search_tidyup called >>Headers after rewriting and local additions: * To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example T To: deny_me@rwtest.example -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D -Data file written for message 10HmaZ-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +Data file written for message 10HmaZ-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for r3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27270,9 +27270,9 @@ warn: condition test failed in ACL "check" processing "accept" (TESTSUITE/test-config 17) accept: condition test succeeded in ACL "check" end of ACL "check": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 DSN: **** SPOOL_OUT - address: <r3@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -27416,16 +27416,16 @@ LOG: MAIN search_tidyup called >>Headers after rewriting and local additions: T To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D -Data file written for message 10HmbA-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +Data file written for message 10HmbA-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for r4@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27438,9 +27438,9 @@ warn: condition test succeeded in ACL "check" processing "accept" (TESTSUITE/test-config 17) accept: condition test succeeded in ACL "check" end of ACL "check": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 DSN: **** SPOOL_OUT - address: <r4@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -27582,16 +27582,16 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: T To: undisclosed recpients:; -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbB-0005vi-00-D -Data file written for message 10HmbB-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbB-000000005vi-0000-D +Data file written for message 10HmbB-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for r5@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27601,9 +27601,9 @@ warn: condition test failed in ACL "check" processing "accept" (TESTSUITE/test-config 17) accept: condition test succeeded in ACL "check" end of ACL "check": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-000000005vi-0000 DSN: **** SPOOL_OUT - address: <r5@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbB-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -27747,16 +27747,16 @@ LOG: MAIN search_tidyup called >>Headers after rewriting and local additions: T To: fred@ -I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbC-0005vi-00-D -Data file written for message 10HmbC-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbC-000000005vi-0000-D +Data file written for message 10HmbC-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for r6@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check" @@ -27769,9 +27769,9 @@ warn: condition test succeeded in ACL "check" processing "accept" (TESTSUITE/test-config 17) accept: condition test succeeded in ACL "check" end of ACL "check": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-000000005vi-0000 DSN: **** SPOOL_OUT - address: <r6@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbC-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0476 b/test/stderr/0476 index ebfed87b4..86070390d 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -5,19 +5,19 @@ dropping to exim gid; retaining priv uid set_process_info: pppp running the queue (single queue run) LOG: queue_run MAIN Start queue run: pid=p1234 -set_process_info: pppp running queue: 10HmaX-0005vi-00-H -set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid p1234) +set_process_info: pppp running queue: 10HmaX-000000005vi-0000 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 (queue run pid p1234) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -set_process_info: pppp delivering 10HmaX-0005vi-00 using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 using t1 t1 transport entered userx@test.ex hostlist: '127.0.0.1' IP 127.0.0.1 port -1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) -set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@test.ex) +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name @@ -49,15 +49,15 @@ cmd buf flush ddd bytes H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:RSET' -set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK +set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK Leaving t1 transport -set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess) -set_process_info: pppp running queue: waiting for 10HmaX-0005vi-00 (pppp) -set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish -set_process_info: pppp delivering 10HmaX-0005vi-00 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 (just run t1 for userx@test.ex in subprocess) +set_process_info: pppp running queue: waiting for 10HmaX-000000005vi-0000 (pppp) +set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish +set_process_info: pppp delivering 10HmaX-000000005vi-0000 LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 550 NO -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -66,40 +66,40 @@ set_process_info: pppp accepting a local non-SMTP message from <> cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaZ-0005vi-00 +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> CALLER@the.local.host.name <-------- -set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1 +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 using t1 t1 transport entered CALLER@the.local.host.name hostlist: '127.0.0.1' IP 127.0.0.1 port -1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name) -set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name) +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name) +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name) Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused -set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER +set_process_info: pppp delivering 10HmaZ-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database -added 10HmaZ-0005vi-00 to queue for 127.0.0.1 +added 10HmaZ-000000005vi-0000 to queue for 127.0.0.1 Leaving t1 transport -set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess) -set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish -set_process_info: pppp delivering 10HmaZ-0005vi-00 +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 (just run t1 for CALLER@the.local.host.name in subprocess) +set_process_info: pppp delivering 10HmaZ-000000005vi-0000: waiting for a remote delivery subprocess to finish +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 LOG: MAIN == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused -set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN @@ -107,11 +107,11 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue -set_process_info: pppp running queue: 10HmaY-0005vi-00-H -set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid p1234) +set_process_info: pppp running queue: 10HmaY-000000005vi-0000 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 (queue run pid p1234) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@test.ex <-------- -set_process_info: pppp delivering 10HmaY-0005vi-00 using t1 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 using t1 t1 transport entered usery@test.ex hostlist: @@ -121,15 +121,15 @@ no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = unusable all IP addresses skipped or deferred at least one address updating wait-t1 database -added 10HmaY-0005vi-00 to queue for 127.0.0.1 +added 10HmaY-000000005vi-0000 to queue for 127.0.0.1 Leaving t1 transport -set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.ex in subprocess) -set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp) -set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish -set_process_info: pppp delivering 10HmaY-0005vi-00 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 (just run t1 for usery@test.ex in subprocess) +set_process_info: pppp running queue: waiting for 10HmaY-000000005vi-0000 (pppp) +set_process_info: pppp delivering 10HmaY-000000005vi-0000: waiting for a remote delivery subprocess to finish +set_process_info: pppp delivering 10HmaY-000000005vi-0000 LOG: retry_defer MAIN == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex' -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 >>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue diff --git a/test/stderr/0487 b/test/stderr/0487 index fb2536a9b..c28c3f34f 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -53,28 +53,28 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: F From: unqualified -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER (helo=x.y) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-esmtp S=sss created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -87,9 +87,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_local=0 ident=CALLER Non-recipients: @@ -148,7 +148,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/userx format=unix @@ -179,7 +179,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -196,7 +196,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0489 b/test/stderr/0489 index f1e4ed2c5..1e328e28b 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -12,20 +12,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: "Phil Q. Hazel" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -45,20 +45,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: John "Jack" Smith <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -77,20 +77,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D -Data file written for message 10HmaZ-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +Data file written for message 10HmaZ-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -109,20 +109,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D -Data file written for message 10HmbA-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +Data file written for message 10HmbA-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -141,20 +141,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbB-0005vi-00-D -Data file written for message 10HmbB-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbB-000000005vi-0000-D +Data file written for message 10HmbB-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmbB-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -173,20 +173,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbC-0005vi-00-D -Data file written for message 10HmbC-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbC-000000005vi-0000-D +Data file written for message 10HmbC-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmbC-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -205,20 +205,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex> F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbD-0005vi-00-D -Data file written for message 10HmbD-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbD-000000005vi-0000-D +Data file written for message 10HmbD-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbD-0005vi-00 + id 10HmbD-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmbD-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -237,20 +237,20 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex> F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbE-0005vi-00-D -Data file written for message 10HmbE-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbE-000000005vi-0000-D +Data file written for message 10HmbE-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbE-0005vi-00 + id 10HmbE-000000005vi-0000 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-0005vi-00 -Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmbE-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0503 b/test/stderr/0503 index 35c5901b3..c064642d5 100644 --- a/test/stderr/0503 +++ b/test/stderr/0503 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=r1 T=t1 defer (-1): Malformed value "20F" (expansion of "${if eq{1}{1}{20F}{}}") in t1 transport +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@myhost.test.ex R=r1 T=t1 defer (-1): Malformed value "20F" (expansion of "${if eq{1}{1}{20F}{}}") in t1 transport diff --git a/test/stderr/0504 b/test/stderr/0504 index 28ed8eb1c..0d9ed0c80 100644 --- a/test/stderr/0504 +++ b/test/stderr/0504 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=r1 T=t1 defer (-24): transport filter process failed (127) while writing to TESTSUITE/test-mail/userx: unable to execute command -1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@myhost.test.ex R=r1 T=t2 defer (-24): Transport filter process failed (127): unable to execute command +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@myhost.test.ex R=r1 T=t1 defer (-24): transport filter process failed (127) while writing to TESTSUITE/test-mail/userx: unable to execute command +1999-03-02 09:44:33 10HmaY-000000005vi-0000 == userx@myhost.test.ex R=r1 T=t2 defer (-24): Transport filter process failed (127): unable to execute command diff --git a/test/stderr/0512 b/test/stderr/0512 index 95249213a..18ebdc002 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -13,7 +13,7 @@ getting address for 127.0.0.1 checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN @@ -25,7 +25,7 @@ getting address for 127.0.0.1 checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN @@ -37,7 +37,7 @@ getting address for 127.0.0.1 checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN @@ -49,7 +49,7 @@ getting address for 127.0.0.1 checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN @@ -71,7 +71,7 @@ admin user cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -104,7 +104,7 @@ getting address for 127.0.0.1 checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN @@ -116,7 +116,7 @@ getting address for 127.0.0.1 checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex) hosts_max_try limit reached with this host Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN @@ -140,7 +140,7 @@ admin user cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 LOG: MAIN - <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0514 b/test/stderr/0514 index 8f0b2aeec..31658bec3 100644 --- a/test/stderr/0514 +++ b/test/stderr/0514 @@ -7,7 +7,7 @@ changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp listing the queue looking in TESTSUITE/spool//input -reading spool file 10HmaX-0005vi-00-H +reading spool file 10HmaX-000000005vi-0000-H user=spaced user uid=CALLER_UID gid=CALLER_GID sender="spaced user"@myhost.test.ex sender_local=1 ident=spaced user Non-recipients: diff --git a/test/stderr/0525 b/test/stderr/0525 index 61b939d46..fa4f709a1 100644 --- a/test/stderr/0525 +++ b/test/stderr/0525 @@ -2,7 +2,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Welcome SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/0544 b/test/stderr/0544 index 6d540d91a..17ec179ea 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -309,7 +309,7 @@ admin user ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaX-0005vi-00 + ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -336,7 +336,7 @@ admin user for $received_for}} ╰─────result: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stderr/0569 b/test/stderr/0569 index 01c249b0a..706e61db5 100644 --- a/test/stderr/0569 +++ b/test/stderr/0569 @@ -34,7 +34,7 @@ >>> 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=(test) [V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -69,7 +69,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s >>> check verify = header_names_ascii >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found +LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -106,7 +106,7 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> check verify = header_names_ascii >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found +LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -141,7 +141,7 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected >>> check verify = header_names_ascii >>> require: condition test failed in ACL "check_message" >>> end of ACL "check_message": not OK -LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found +LOG: 10HmbC-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -178,7 +178,7 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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=(test) [V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -215,4 +215,4 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s >>> 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=(test) [V4NET.10.10.10] P=smtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss diff --git a/test/stderr/0575 b/test/stderr/0575 index 95f8f0877..3c7534e44 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -51,18 +51,18 @@ rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.0.0.0] (helo=test) by mail.test.ex with smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= x@y H=(test) [V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 smtp_setup_msg entered SMTP<< quit SMTP>> 221 mail.test.ex closing connection diff --git a/test/stderr/0584 b/test/stderr/0584 index 28ec3e523..32ce9e762 100644 --- a/test/stderr/0584 +++ b/test/stderr/0584 @@ -26,7 +26,7 @@ >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -82,4 +82,4 @@ LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sende >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss diff --git a/test/stderr/0593 b/test/stderr/0593 index c91120311..46623b65a 100644 --- a/test/stderr/0593 +++ b/test/stderr/0593 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted diff --git a/test/stderr/0594 b/test/stderr/0594 index 1f53b724d..e1dc02686 100644 --- a/test/stderr/0594 +++ b/test/stderr/0594 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == |TESTSUITE/bin/iefbr14 <pipe-userx=TESTSUITE/bin/iefbr14@test.ex> R=r0 T=t0 defer (0): Tainted 'TESTSUITE/bin/iefbr14' (command for t0 transport) not permitted -1999-03-02 09:44:33 10HmaY-0005vi-00 == |echo rtr_user <rtr_user@test.ex> R=r1 T=t0 defer (0): Tainted 'echo rtr_user' (command for t0 transport) not permitted +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == |TESTSUITE/bin/iefbr14 <pipe-userx=TESTSUITE/bin/iefbr14@test.ex> R=r0 T=t0 defer (0): Tainted 'TESTSUITE/bin/iefbr14' (command for t0 transport) not permitted +1999-03-02 09:44:33 10HmaY-000000005vi-0000 == |echo rtr_user <rtr_user@test.ex> R=r1 T=t0 defer (0): Tainted 'echo rtr_user' (command for t0 transport) not permitted diff --git a/test/stderr/0601 b/test/stderr/0601 index 2a00021be..9c6b0c075 100644 --- a/test/stderr/0601 +++ b/test/stderr/0601 @@ -1,64 +1,64 @@ -SYSLOG: '10HmaX-0005vi-00 msg' -SYSLOG: '10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmaY-0005vi-00 msg' -SYSLOG: '10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmaZ-0005vi-00 msg' -SYSLOG: '10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbA-0005vi-00 msg' -SYSLOG: '10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbB-0005vi-00 msg' -SYSLOG: '10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbC-0005vi-00 msg' -SYSLOG: '10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbD-0005vi-00 msg' -SYSLOG: '10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbE-0005vi-00 msg' -SYSLOG: '10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbF-0005vi-00 msg' -SYSLOG: '10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbG-0005vi-00 msg' -SYSLOG: '10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbH-0005vi-00 msg' -SYSLOG: '10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '10HmbI-0005vi-00 msg' -SYSLOG: '10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '[1250] 10HmbJ-0005vi-00 msg' -SYSLOG: '[1250] 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '[1251] 10HmbK-0005vi-00 msg' -SYSLOG: '[1251] 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '[1252] 10HmbL-0005vi-00 msg' -SYSLOG: '[1252] 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '[1253] 10HmbM-0005vi-00 msg' -SYSLOG: '[1253] 10HmbM-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 10HmbN-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 10HmbN-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmbO-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 10HmbP-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbQ-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbQ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 10HmbR-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 10HmbR-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmbS-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmbS-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 10HmbT-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 10HmbT-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbU-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbU-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 10HmbV-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 10HmbV-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmbW-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmbW-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 10HmbX-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 10HmbX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbY-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 [1254] 10HmbZ-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 [1254] 10HmbZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmcA-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05 +9999 10HmcA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 [1255] 10HmcB-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 [1255] 10HmcB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' -SYSLOG: '2017-07-30 18:51:05.712 +9999 [1256] 10HmcC-0005vi-00 msg' -SYSLOG: '2017-07-30 18:51:05.712 +9999 [1256] 10HmcC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmaX-000000005vi-0000 msg' +SYSLOG: '10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmaY-000000005vi-0000 msg' +SYSLOG: '10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmaZ-000000005vi-0000 msg' +SYSLOG: '10HmaZ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbA-000000005vi-0000 msg' +SYSLOG: '10HmbA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbB-000000005vi-0000 msg' +SYSLOG: '10HmbB-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbC-000000005vi-0000 msg' +SYSLOG: '10HmbC-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbD-000000005vi-0000 msg' +SYSLOG: '10HmbD-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbE-000000005vi-0000 msg' +SYSLOG: '10HmbE-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbF-000000005vi-0000 msg' +SYSLOG: '10HmbF-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbG-000000005vi-0000 msg' +SYSLOG: '10HmbG-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbH-000000005vi-0000 msg' +SYSLOG: '10HmbH-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '10HmbI-000000005vi-0000 msg' +SYSLOG: '10HmbI-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '[1250] 10HmbJ-000000005vi-0000 msg' +SYSLOG: '[1250] 10HmbJ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '[1251] 10HmbK-000000005vi-0000 msg' +SYSLOG: '[1251] 10HmbK-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '[1252] 10HmbL-000000005vi-0000 msg' +SYSLOG: '[1252] 10HmbL-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '[1253] 10HmbM-000000005vi-0000 msg' +SYSLOG: '[1253] 10HmbM-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 10HmbN-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 10HmbN-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmbO-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmbO-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 10HmbP-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 10HmbP-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbQ-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbQ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 10HmbR-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 10HmbR-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmbS-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmbS-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 10HmbT-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 10HmbT-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbU-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbU-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 10HmbV-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 10HmbV-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmbW-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmbW-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 10HmbX-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 10HmbX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbY-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 [1254] 10HmbZ-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 [1254] 10HmbZ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmcA-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05 +9999 10HmcA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 [1255] 10HmcB-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 [1255] 10HmcB-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' +SYSLOG: '2017-07-30 18:51:05.712 +9999 [1256] 10HmcC-000000005vi-0000 msg' +SYSLOG: '2017-07-30 18:51:05.712 +9999 [1256] 10HmcC-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss' diff --git a/test/stderr/0608 b/test/stderr/0608 index 0cf96cfdc..fbdc6c9ef 100644 --- a/test/stderr/0608 +++ b/test/stderr/0608 @@ -1,8 +1,8 @@ -2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for error message texts: No such file or directory -2017-07-30 18:51:05.712 10HmaY-0005vi-00 bounce_message_file is not absolute after expansion: 'relative_file_path' +2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for error message texts: No such file or directory +2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 bounce_message_file is not absolute after expansion: 'relative_file_path' -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset' +2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Failed to expand bounce_message_file: '$acl_m_unset' -2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' +2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' -2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory +2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory diff --git a/test/stderr/0618 b/test/stderr/0618 index 3660861ce..7efaf8a8e 100644 --- a/test/stderr/0618 +++ b/test/stderr/0618 @@ -22,7 +22,7 @@ >>> good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list") >>> accept: condition test succeeded in ACL "chk_rcpt" >>> end of ACL "chk_rcpt": ACCEPT -LOG: 10HmbA-0005vi-00 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss +LOG: 10HmbA-000000005vi-0000 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss >>> using ACL "chk_rcpt" >>> processing "accept" (TESTSUITE/test-config 20) >>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list @@ -35,6 +35,6 @@ LOG: 10HmbA-0005vi-00 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss >>> good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list") >>> accept: condition test succeeded in ACL "chk_rcpt" >>> end of ACL "chk_rcpt": ACCEPT -LOG: 10HmbB-0005vi-00 <= b@test.ex H=(tester) [99.99.99.99] P=smtp S=sss +LOG: 10HmbB-000000005vi-0000 <= b@test.ex H=(tester) [99.99.99.99] P=smtp S=sss ******** SERVER ******** diff --git a/test/stderr/0623 b/test/stderr/0623 index cc9c3dcf9..db3130155 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -16,7 +16,7 @@ using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -55,7 +55,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:451:221' -added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN @@ -82,7 +82,7 @@ checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbA-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) +delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -148,7 +148,7 @@ checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbB-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) +delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -187,7 +187,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT' -added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN diff --git a/test/stderr/0628 b/test/stderr/0628 index 215206a82..f112b1cc7 100644 --- a/test/stderr/0628 +++ b/test/stderr/0628 @@ -5,13 +5,13 @@ 01:01:01 p1237 ╭considering: ${tod_full} 01:01:01 p1237 ├──expanding: ${tod_full} 01:01:01 p1237 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 -01:01:01 p1237 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +01:01:01 p1237 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 01:01:01 p1237 DSN: **** SPOOL_OUT - address: <dest@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -01:01:01 p1237 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +01:01:01 p1237 Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H 01:01:01 p1237 Size of headers = sss 01:01:01 p1237 LOG: MAIN 01:01:01 p1237 <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss -01:01:01 p1237 SMTP>> 250 OK id=10HmaX-0005vi-00 +01:01:01 p1237 SMTP>> 250 OK id=10HmaX-000000005vi-0000 01:01:01 p1237 search_tidyup called 01:01:01 p1237 Sender: tester@test.ex 01:01:01 p1237 Recipients: @@ -35,9 +35,9 @@ 01:01:01 p1239 admin user 01:01:01 p1239 dropping to exim gid; retaining priv uid 01:01:01 p1239 set_process_info: pppp delivering specified messages -01:01:01 p1239 set_process_info: pppp delivering 10HmaX-0005vi-00 -01:01:01 p1239 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -01:01:01 p1239 reading spool file 10HmaX-0005vi-00-H +01:01:01 p1239 set_process_info: pppp delivering 10HmaX-000000005vi-0000 +01:01:01 p1239 Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +01:01:01 p1239 reading spool file 10HmaX-000000005vi-0000-H 01:01:01 p1239 user=EXIMUSER uid=EXIM_UID gid=EXIM_GID sender=tester@test.ex 01:01:01 p1239 sender_fullhost = (test.ex) [127.0.0.1] 01:01:01 p1239 sender_rcvhost = [127.0.0.1] (helo=test.ex) @@ -86,7 +86,7 @@ 01:01:01 p1239 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> 01:01:01 p1239 changed uid/gid: post-delivery tidying 01:01:01 p1239 uid=EXIM_UID gid=EXIM_GID pid=p1239 -01:01:01 p1239 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +01:01:01 p1239 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 01:01:01 p1239 Processing retry items 01:01:01 p1239 Succeeded addresses: 01:01:01 p1239 dest@test.ex: no retry items @@ -103,7 +103,7 @@ 01:01:01 p1239 DSN: not sending DSN success message 01:01:01 p1239 LOG: MAIN 01:01:01 p1239 Completed -01:01:01 p1239 end delivery of 10HmaX-0005vi-00 +01:01:01 p1239 end delivery of 10HmaX-000000005vi-0000 01:01:01 p1239 search_tidyup called 01:01:01 p1239 search_tidyup called 01:01:01 p1239 >>>>>>>>>>>>>>>> Exim pid=p1239 (daemon-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -118,15 +118,15 @@ 01:01:01 p1240 ╭considering: ${tod_full} 01:01:01 p1240 ├──expanding: ${tod_full} 01:01:01 p1240 ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 -01:01:01 p1240 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +01:01:01 p1240 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 01:01:01 p1240 DSN: **** SPOOL_OUT - address: <dest2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -01:01:01 p1240 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +01:01:01 p1240 Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H 01:01:01 p1240 Size of headers = sss 01:01:01 p1240 LOG: MAIN 01:01:01 p1240 <= tester2@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss 01:01:01 p1240 LOG: delay_delivery MAIN 01:01:01 p1240 no immediate delivery: queued by ACL -01:01:01 p1240 SMTP>> 250 OK id=10HmaY-0005vi-00 +01:01:01 p1240 SMTP>> 250 OK id=10HmaY-000000005vi-0000 01:01:01 p1240 search_tidyup called 01:01:01 p1240 Sender: tester2@test.ex 01:01:01 p1240 Recipients: @@ -188,7 +188,7 @@ 01:01:01 p1241 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> 01:01:01 p1241 changed uid/gid: post-delivery tidying 01:01:01 p1241 uid=EXIM_UID gid=EXIM_GID pid=p1241 -01:01:01 p1241 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +01:01:01 p1241 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 01:01:01 p1241 Processing retry items 01:01:01 p1241 Succeeded addresses: 01:01:01 p1241 dest2@test.ex: no retry items @@ -205,7 +205,7 @@ 01:01:01 p1241 DSN: not sending DSN success message 01:01:01 p1241 LOG: MAIN 01:01:01 p1241 Completed -01:01:01 p1241 end delivery of 10HmaY-0005vi-00 +01:01:01 p1241 end delivery of 10HmaY-000000005vi-0000 01:01:01 p1241 search_tidyup called 01:01:01 p1241 >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0632 b/test/stderr/0632 index 031df4c5b..0103f0b2c 100644 --- a/test/stderr/0632 +++ b/test/stderr/0632 @@ -438,7 +438,7 @@ p1235 for $received_for}} p1235 ├───────text: id p1235 ├considering: $message_exim_id${if def:received_for { p1235 for $received_for}} -p1235 ├──────value: 10HmaX-0005vi-00 +p1235 ├──────value: 10HmaX-000000005vi-0000 p1235 ├considering: ${if def:received_for { p1235 for $received_for}} p1235 ├──condition: def:received_for @@ -469,7 +469,7 @@ p1235 for $received_for}} p1235 ╰─────result: Received: from [127.0.0.1] (helo=test.ex) p1235 by myhost.test.ex with smtp (Exim x.yz) p1235 (envelope-from <CALLER@test.ex>) -p1235 id 10HmaX-0005vi-00 +p1235 id 10HmaX-000000005vi-0000 p1235 for dest_1@test.ex p1235 ╰──(tainted) p1235 ╭considering: ${tod_full} @@ -892,7 +892,7 @@ p1236 for $received_for}} p1236 ├───────text: id p1236 ├considering: $message_exim_id${if def:received_for { p1236 for $received_for}} -p1236 ├──────value: 10HmaY-0005vi-00 +p1236 ├──────value: 10HmaY-000000005vi-0000 p1236 ├considering: ${if def:received_for { p1236 for $received_for}} p1236 ├──condition: def:received_for @@ -923,7 +923,7 @@ p1236 for $received_for}} p1236 ╰─────result: Received: from [127.0.0.1] (helo=test.ex) p1236 by myhost.test.ex with smtp (Exim x.yz) p1236 (envelope-from <CALLER@test.ex>) -p1236 id 10HmaY-0005vi-00 +p1236 id 10HmaY-000000005vi-0000 p1236 for dest_2@test.ex p1236 ╰──(tainted) p1236 ╭considering: ${tod_full} diff --git a/test/stderr/0633 b/test/stderr/0633 index 0bf24f020..21a7f21cc 100644 --- a/test/stderr/0633 +++ b/test/stderr/0633 @@ -15,27 +15,25 @@ >>> end of inline ACL: ACCEPT >>> using ACL "check_data" >>> processing "accept" (TESTSUITE/test-config 15) ->>> check set acl_m0 = ${sg{${sg{${sg{aaa}{a}{bbbbbbbbbbb}}}{b}{ccccccccccccc}}}{c}{ddddddddddddddddddd}} +>>> check set acl_m0 = ${sg{${sg{${sg{aaa}{a}{bbbbbbbbbbb}}}{b}{cccccccccccc}}}{c}{ddddddddddddddddddd}} >>> = dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd **** debug string too long - truncated **** ->>> check logwrite = ${acl_m0} +>>> check logwrite = ${acl_m0}eeeeeeeeeeeeeee >>> = dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd **** debug string too long - truncated **** -LOG: 10HmaX-0005vi-00 ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd ->>> check logwrite = ${acl_m0}a +LOG: 10HmaX-000000005vi-0000 ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddeeeeeeeeeeeeeee +>>> check logwrite = ${acl_m0}eeeeeeeeeeeeeeea >>> = dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd **** debug string too long - truncated **** -LOG: 10HmaX-0005vi-00 ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda ->>> check logwrite = ${acl_m0}aa +LOG: 10HmaX-000000005vi-0000 ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddeeeeeeeeeeeeeeea +>>> check logwrite = ${acl_m0}eeeeeeeeeeeeeeeaa >>> = dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd **** debug string too long - truncated **** -LOG: 10HmaX-0005vi-00 **** log string overflowed log buffer **** - ->>> check logwrite = ${acl_m0}aaa +LOG: 10HmaX-000000005vi-0000 ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddeeeeeeeeeeeeeeeaa +>>> check logwrite = ${acl_m0}eeeeeeeeeeeeeeeaaa >>> = dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd **** debug string too long - truncated **** -LOG: 10HmaX-0005vi-00 **** log string overflowed log buffer **** - +LOG: 10HmaX-000000005vi-0000 ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddeeeeeeeeeeeeeeeaaa >>> accept: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": ACCEPT -LOG: 10HmaX-0005vi-00 <= <> H=(test) [V4NET.0.0.0] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= <> H=(test) [V4NET.0.0.0] P=smtp S=sss diff --git a/test/stderr/0700 b/test/stderr/0700 index f05729b31..5a6d66620 100644 --- a/test/stderr/0700 +++ b/test/stderr/0700 @@ -1,5 +1,6 @@ ### A Message ID as it appears in an email: ### A Message ID as it appears in the exim log: +### New-format log message ID ### Just the date part of the Message ID: ### The Epoch ... ### ... the script was under development at this time ... @@ -22,26 +23,37 @@ zzzzzzz not parsed ### Print date as seconds since the UNIX epoch. ### Show the process id too ### Override the value of localhost_number set in the exim configuation file +localhost 9 from message-id != given number 11 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 11 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. localhost_number > 10 +localhost 9 from message-id != given number 11 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. localhost_number must be a number >=0 localhost_number > 16 ### From here as 701 - 703 ### Each msg-id type, all zone ### All msg-id types, all zones, localhost_number = 3 +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 localhost_number > 16 localhost_number > 16 ### All msg-id types, all zones, base=36 -zz is not base 36 zzzzzz is not base 36 ### All msg-id types, all zones, base=62 ******** SERVER ******** ### A Message ID as it appears in an email: ### A Message ID as it appears in the exim log: +### New-format log message ID ### Just the date part of the Message ID: ### The Epoch ... ### ... the script was under development at this time ... diff --git a/test/stderr/0701 b/test/stderr/0701 index 2c54c7033..cf2c96fae 100644 --- a/test/stderr/0701 +++ b/test/stderr/0701 @@ -1,15 +1,33 @@ ### Each msg-id type, all zone +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 3 +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 localhost_number > 16 localhost_number > 16 ### All msg-id types, all zones, base=36 +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. zz is not base 36 zzzzzz is not base 36 ### All msg-id types, all zones, base=62 +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ******** SERVER ******** ### Each msg-id type, all zone diff --git a/test/stderr/0702 b/test/stderr/0702 index 352412472..a84a6f097 100644 --- a/test/stderr/0702 +++ b/test/stderr/0702 @@ -1,6 +1,18 @@ ### Each msg-id type, all zone +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 3 +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 @@ -12,6 +24,10 @@ localhost_number > 10 localhost_number > 10 localhost_number > 10 ### All msg-id types, all zones, base=62 +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ******** SERVER ******** ### Each msg-id type, all zone diff --git a/test/stderr/0703 b/test/stderr/0703 index 696b3521b..42de6f1c2 100644 --- a/test/stderr/0703 +++ b/test/stderr/0703 @@ -4,7 +4,15 @@ localhost_number > 16 localhost_number > 16 localhost_number > 16 ### All msg-id types, all zones, localhost_number = 3 +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 3 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 13 +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 0 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 19 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. +localhost 9 from message-id != given number 13 at /data/jgh/git/exim/test/eximdir/exim_msgdate line 387. ### All msg-id types, all zones, localhost_number = 20 localhost_number > 16 localhost_number > 16 diff --git a/test/stderr/0911 b/test/stderr/0911 index 55dff42df..e80deaa6b 100644 --- a/test/stderr/0911 +++ b/test/stderr/0911 @@ -20,7 +20,7 @@ using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (good@test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (good@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -40,7 +40,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 315 LAST + SMTP+> BDAT 329 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -86,7 +86,7 @@ using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (nopipe@test.ex) +delivering 10HmaY-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (nopipe@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -105,7 +105,7 @@ cmd buf flush ddd bytes sync_responses expect rcpt for nopipe@test.ex SMTP<< 250 OK rcpt will write message using CHUNKING - SMTP+> BDAT 317 LAST + SMTP+> BDAT 331 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 @@ -151,7 +151,7 @@ using the transport's hosts: 127.0.0.1 getting address for 127.0.0.1 checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) +delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (tempreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -171,7 +171,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 321 LAST + SMTP+> BDAT 335 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -189,7 +189,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:451:221' -added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN @@ -221,7 +221,7 @@ checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbA-0005vi-00 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) +delivering 10HmbA-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (permreject@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -241,7 +241,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 321 LAST + SMTP+> BDAT 335 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -291,7 +291,7 @@ checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbB-0005vi-00 to 127.0.0.1 [127.0.0.1] (dataloss@test.ex) +delivering 10HmbB-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (dataloss@test.ex) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -311,7 +311,7 @@ transport_check_waiting entered no messages waiting for 127.0.0.1 transport_check_waiting: FALSE will pipeline QUIT - SMTP+> BDAT 319 LAST + SMTP+> BDAT 333 LAST cmd buf flush ddd bytes (more expected) cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 (more expected) @@ -329,7 +329,7 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250' -added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6 +added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport LOG: MAIN diff --git a/test/stderr/0999 b/test/stderr/0999 index d7d568b47..ce65c8fa2 100644 --- a/test/stderr/0999 +++ b/test/stderr/0999 @@ -1,84 +1,84 @@ -2017-07-30 18:51:05.712 10HmaX-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmaY-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbA-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbB-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbC-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbD-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbE-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbF-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbG-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbH-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbI-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbJ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbK-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbL-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbM-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbN-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbO-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbP-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbQ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbR-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbS-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbT-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbU-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbV-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbW-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbX-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbY-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmbZ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcA-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcB-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcC-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcD-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcE-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcF-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcG-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcH-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcI-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcJ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcK-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcL-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcM-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcN-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcO-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcP-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcQ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcR-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcS-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcT-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcU-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcV-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcW-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcX-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcY-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmcZ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdA-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdB-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdC-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdD-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdE-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdF-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdG-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdH-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdI-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdJ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdK-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdL-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdM-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdN-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdO-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdP-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdQ-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdR-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdS-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdT-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdU-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdV-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdW-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdX-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdY-0005vi-00 no immediate delivery: queued by ACL -2017-07-30 18:51:05.712 10HmdZ-0005vi-00 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbB-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbC-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbD-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbE-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbF-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbG-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbH-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbI-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbJ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbK-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbL-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbM-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbN-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbO-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbP-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbQ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbR-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbS-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbT-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbU-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbV-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbW-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbX-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbY-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmbZ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcA-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcB-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcC-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcD-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcE-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcF-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcG-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcH-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcI-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcJ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcK-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcL-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcM-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcN-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcO-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcP-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcQ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcR-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcS-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcT-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcU-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcV-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcW-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcX-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcY-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmcZ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdA-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdB-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdC-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdD-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdE-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdF-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdG-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdH-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdI-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdJ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdK-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdL-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdM-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdN-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdO-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdP-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdQ-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdR-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdS-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdT-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdU-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdV-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdW-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdX-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdY-000000005vi-0000 no immediate delivery: queued by ACL +2017-07-30 18:51:05.712 10HmdZ-000000005vi-0000 no immediate delivery: queued by ACL 2017-07-30 18:51:05.712 Start queue run: pid=p1234 -qq 2017-07-30 18:51:05.712 End queue run: pid=p1234 -qq 81 messages in diff --git a/test/stderr/1003 b/test/stderr/1003 index 80599193e..2a00c626e 100644 --- a/test/stderr/1003 +++ b/test/stderr/1003 @@ -1,3 +1,3 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == user6@h5.test.ex R=client T=send_to_server5 defer (-1): failed to expand "interface" option for send_to_server5 transport: condition name expected, but found "" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == user6@h5.test.ex R=client T=send_to_server5 defer (-1): failed to expand "interface" option for send_to_server5 transport: condition name expected, but found "" ******** SERVER ******** diff --git a/test/stderr/1150 b/test/stderr/1150 index 6da84a2cb..1640aa020 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -1,6 +1,6 @@ LOG: queue_run MAIN Start queue run: pid=p1234 -qf -delivering 10HmaX-0005vi-00 (queue run pid p1234) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed @@ -27,15 +27,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP>> (writing message) SMTP>> . SMTP>> QUIT - SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP<< 250 OK id=10HmaZ-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-000000005vi-0000" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid p1234) +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed @@ -64,14 +64,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP>> (writing message) SMTP>> . SMTP>> QUIT - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP<< 250 OK id=10HmbA-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:RCPT|:DATA:250:250:250:354:.:QUIT:250:221' LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" LOG: MAIN - -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" + -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex @@ -98,12 +98,12 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP>> (writing message) SMTP>> . SMTP>> QUIT - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP<< 250 OK id=10HmbB-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" + => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-000000005vi-0000" LOG: MAIN Completed LOG: queue_run MAIN diff --git a/test/stderr/1157 b/test/stderr/1157 index 5e1ec4d4c..fbb2e0761 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -35,9 +35,9 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> . - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP<< 250 OK id=10HmbA-000000005vi-0000 LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" + => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -54,11 +54,11 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> . - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP<< 250 OK id=10HmbB-000000005vi-0000 SMTP(close)>> cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250' LOG: MAIN - => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" + => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1246 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -79,12 +79,12 @@ cmd buf flush ddd bytes cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP(TLS shutdown)>> - SMTP<< 250 OK id=10HmbC-0005vi-00 + SMTP<< 250 OK id=10HmbC-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" + => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1247 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -129,9 +129,9 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> . - SMTP<< 250 OK id=10HmbG-0005vi-00 + SMTP<< 250 OK id=10HmbG-000000005vi-0000 LOG: MAIN - => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00" + => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1252 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -148,11 +148,11 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> . - SMTP<< 250 OK id=10HmbH-0005vi-00 + SMTP<< 250 OK id=10HmbH-000000005vi-0000 SMTP(close)>> cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250' LOG: MAIN - => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" + => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1253 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -173,12 +173,12 @@ cmd buf flush ddd bytes cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP(TLS shutdown)>> - SMTP<< 250 OK id=10HmbI-0005vi-00 + SMTP<< 250 OK id=10HmbI-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" + => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1254 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -223,7 +223,7 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> . - SMTP<< 250 OK id=10HmbM-0005vi-00 + SMTP<< 250 OK id=10HmbM-000000005vi-0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] @@ -235,7 +235,7 @@ cmd buf flush ddd bytes SMTP(close)>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-' LOG: MAIN - => user_p@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" + => user_p@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1259 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -262,7 +262,7 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> . - SMTP<< 250 OK id=10HmbN-0005vi-00 + SMTP<< 250 OK id=10HmbN-000000005vi-0000 SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] @@ -274,7 +274,7 @@ cmd buf flush ddd bytes SMTP(close)>> cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-' LOG: MAIN - => user_r@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" + => user_r@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1260 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -303,12 +303,12 @@ cmd buf flush ddd bytes SMTP>> . SMTP>> QUIT cmd buf flush ddd bytes - SMTP<< 250 OK id=10HmbO-0005vi-00 + SMTP<< 250 OK id=10HmbO-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => user_q@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" + => user_q@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1261 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/1160 b/test/stderr/1160 index 54b2f44e4..7a2a1aee5 100644 --- a/test/stderr/1160 +++ b/test/stderr/1160 @@ -1,6 +1,6 @@ LOG: queue_run MAIN Start queue run: pid=p1234 -qf -delivering 10HmaX-0005vi-00 (queue run pid p1234) +delivering 10HmaX-000000005vi-0000 (queue run pid p1234) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed @@ -18,15 +18,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP>> (writing message) SMTP>> . SMTP>> QUIT - SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP<< 250 OK id=10HmaZ-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-000000005vi-0000" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid p1234) +delivering 10HmaY-000000005vi-0000 (queue run pid p1234) Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed @@ -46,14 +46,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected SMTP>> (writing message) SMTP>> . SMTP>> QUIT - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP<< 250 OK id=10HmbA-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:RCPT|:DATA:250:250:250:354:.:QUIT:250:221' LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" LOG: MAIN - -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" + -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000" Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex @@ -71,12 +71,12 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected SMTP>> (writing message) SMTP>> . SMTP>> QUIT - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP<< 250 OK id=10HmbB-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" + => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-000000005vi-0000" LOG: MAIN Completed LOG: queue_run MAIN diff --git a/test/stderr/2035 b/test/stderr/2035 index d2621e37f..502516dd5 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -51,7 +51,7 @@ hostlist: already connected to 127.0.0.1 [127.0.0.1] (on fd 0) checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userb@test.ex) continued connection, proxied TLS SMTP>> DATA cmd buf flush ddd bytes @@ -61,7 +61,7 @@ sync_responses expect data cannot use sendfile for body: spoolfile not wireformat SMTP>> . writing data block fd=dddd size=sss timeout=300 - SMTP<< 250 OK id=10HmaY-0005vi-00 + SMTP<< 250 OK id=10HmaY-000000005vi-0000 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL SMTP+> QUIT cmd buf flush ddd bytes (more expected) @@ -72,7 +72,7 @@ cmd buf flush ddd bytes (more expected) cmdlog: 'DATA:354:.:250:QUIT:221' Leaving t1 transport LOG: MAIN - => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" + => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2135 b/test/stderr/2135 index d2621e37f..502516dd5 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -51,7 +51,7 @@ hostlist: already connected to 127.0.0.1 [127.0.0.1] (on fd 0) checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex) +delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userb@test.ex) continued connection, proxied TLS SMTP>> DATA cmd buf flush ddd bytes @@ -61,7 +61,7 @@ sync_responses expect data cannot use sendfile for body: spoolfile not wireformat SMTP>> . writing data block fd=dddd size=sss timeout=300 - SMTP<< 250 OK id=10HmaY-0005vi-00 + SMTP<< 250 OK id=10HmaY-000000005vi-0000 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL SMTP+> QUIT cmd buf flush ddd bytes (more expected) @@ -72,7 +72,7 @@ cmd buf flush ddd bytes (more expected) cmdlog: 'DATA:354:.:250:QUIT:221' Leaving t1 transport LOG: MAIN - => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" + => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2201 b/test/stderr/2201 index 927c7c6de..61b8b2967 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -246,7 +246,7 @@ p1238 dnslists: wrote cache entry, ttl=2 p1238 DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2) p1238 => that means V4NET.11.12.14 is listed at rbl.test.ex LOG: MAIN - <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex + <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-000000005vi-0000@myhost.test.ex Process p1238 is ready for new message LOG: smtp_connection MAIN SMTP connection from localhost (myhost.test.ex) [127.0.0.1] D=qqs closed by QUIT diff --git a/test/stderr/2500 b/test/stderr/2500 index 2a988dbaa..28ec70c0e 100644 --- a/test/stderr/2500 +++ b/test/stderr/2500 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 Tainted filename for search: 'TESTSUITE/tainted@test.ex' -1999-03-02 09:44:33 10HmaY-0005vi-00 Tainted filename for search: 'TESTSUITE/CALLER@myhost.test.ex' +1999-03-02 09:44:33 10HmaX-000000005vi-0000 Tainted filename for search: 'TESTSUITE/tainted@test.ex' +1999-03-02 09:44:33 10HmaY-000000005vi-0000 Tainted filename for search: 'TESTSUITE/CALLER@myhost.test.ex' diff --git a/test/stderr/2600 b/test/stderr/2600 index 7d8e76824..72291ff43 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -535,27 +535,27 @@ rewrite headers From: CALLER_NAME <CALLER@myhost.test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1239 @@ -566,9 +566,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex sender_local=1 ident=CALLER Non-recipients: @@ -638,7 +638,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@myhost.test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1240 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb" search_find: file="TESTSUITE/aux-fixed/sqlitedb" @@ -676,7 +676,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1239 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userx@myhost.test.ex: no retry items @@ -693,7 +693,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2610 b/test/stderr/2610 index 435da7644..db1629170 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -489,16 +489,16 @@ rewrite headers From: CALLER_NAME <CALLER@myhost.test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 using ACL "check_notsmtp" @@ -507,15 +507,15 @@ check set acl_m_qtest = ${quote_mysql:$recipients} = ph10@myhost.test.ex accept: condition test succeeded in ACL "check_notsmtp" end of ACL "check_notsmtp": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <ph10@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 @@ -526,9 +526,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex sender_local=1 ident=CALLER Non-recipients: @@ -619,7 +619,7 @@ search_tidyup called changed uid/gid: local delivery to ph10 <ph10@myhost.test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1238 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to ph10 using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to ph10 using t1 appendfile transport entered search_open: mysql "NULL" search_find: file="NULL" @@ -663,7 +663,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1237 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: ph10@myhost.test.ex: no retry items @@ -680,7 +680,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2620 b/test/stderr/2620 index 2e0e38247..f1e7438cf 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -655,27 +655,27 @@ rewrite headers From: CALLER_NAME <CALLER@myhost.test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <CALLER@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 @@ -686,9 +686,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex sender_local=1 ident=CALLER Non-recipients: @@ -760,7 +760,7 @@ search_tidyup called changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to CALLER using t1 appendfile transport entered search_open: pgsql "NULL" search_find: file="NULL" @@ -800,7 +800,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1238 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: CALLER@myhost.test.ex: no retry items @@ -817,7 +817,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3404 b/test/stderr/3404 index 1ba6a2540..51e88fac3 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -1,6 +1,6 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex @@ -29,7 +29,7 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaY-0005vi-00 +delivering 10HmaY-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex @@ -58,7 +58,7 @@ LOG: MAIN Completed LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss -delivering 10HmaZ-0005vi-00 +delivering 10HmaZ-000000005vi-0000 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex diff --git a/test/stderr/3408 b/test/stderr/3408 index ad2564734..0dce33e58 100644 --- a/test/stderr/3408 +++ b/test/stderr/3408 @@ -62,7 +62,7 @@ >>> end of ACL "check_recipient": DENY LOG: H=(exim.test.ex) [V4NET.11.12.14] F=<postmaster@exim.test.ex> rejected RCPT userx@exim.test.ex: host is listed in rbl.test.ex >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss +LOG: 10HmaX-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -168,4 +168,4 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtpa A=plain:userx S=sss +LOG: 10HmaY-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtpa A=plain:userx S=sss diff --git a/test/stderr/3500 b/test/stderr/3500 index 937595786..523413d16 100644 --- a/test/stderr/3500 +++ b/test/stderr/3500 @@ -102,7 +102,7 @@ >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss +LOG: 10HmaY-000000005vi-0000 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -155,4 +155,4 @@ LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect aut >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaZ-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss +LOG: 10HmaZ-000000005vi-0000 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss diff --git a/test/stderr/4001 b/test/stderr/4001 index df9611573..042d6a204 100644 --- a/test/stderr/4001 +++ b/test/stderr/4001 @@ -24,10 +24,10 @@ >>> processing "accept" (TESTSUITE/test-config 23) >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count -1 -LOG: 10HmaX-0005vi-00 mime_acl: mime_part_count -1 +LOG: 10HmaX-000000005vi-0000 mime_acl: mime_part_count -1 >>> accept: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": ACCEPT -LOG: 10HmaX-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss +LOG: 10HmaX-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss >>> processing "accept" (TESTSUITE/test-config 25) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -37,7 +37,7 @@ LOG: 10HmaX-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp >>> check decode = default >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 0 -LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 0 +LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 0 >>> accept: condition test succeeded in ACL "check_mime" >>> end of ACL "check_mime": ACCEPT >>> using ACL "check_mime" @@ -45,7 +45,7 @@ LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 0 >>> check decode = default >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 1 -LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 1 +LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 1 >>> accept: condition test succeeded in ACL "check_mime" >>> end of ACL "check_mime": ACCEPT >>> using ACL "check_mime" @@ -53,21 +53,21 @@ LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 1 >>> check decode = default >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 2 -LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 2 +LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 2 >>> accept: condition test succeeded in ACL "check_mime" >>> end of ACL "check_mime": ACCEPT >>> using ACL "check_data" >>> processing "accept" (TESTSUITE/test-config 23) >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 2 -LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 2 +LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 2 >>> accept: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": ACCEPT ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF' ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF' ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF' ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF' -LOG: 10HmaY-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF' +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF' +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF' +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF' +LOG: 10HmaY-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss >>> processing "accept" (TESTSUITE/test-config 25) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -77,7 +77,7 @@ LOG: 10HmaY-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp >>> check decode = default >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 0 -LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 0 +LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 0 >>> accept: condition test succeeded in ACL "check_mime" >>> end of ACL "check_mime": ACCEPT >>> using ACL "check_mime" @@ -85,7 +85,7 @@ LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 0 >>> check decode = default >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 1 -LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 1 +LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 1 >>> accept: condition test succeeded in ACL "check_mime" >>> end of ACL "check_mime": ACCEPT >>> using ACL "check_mime" @@ -93,21 +93,21 @@ LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 1 >>> check decode = default >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 2 -LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 2 +LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 2 >>> accept: condition test succeeded in ACL "check_mime" >>> end of ACL "check_mime": ACCEPT >>> using ACL "check_data" >>> processing "accept" (TESTSUITE/test-config 23) >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count 2 -LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 2 +LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 2 >>> accept: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": ACCEPT ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF' ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF' ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF' ->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF' -LOG: 10HmaZ-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF' +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF' +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF' +>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF' +LOG: 10HmaZ-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss >>> processing "accept" (TESTSUITE/test-config 25) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -116,7 +116,7 @@ LOG: 10HmaZ-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp >>> processing "accept" (TESTSUITE/test-config 23) >>> check logwrite = mime_acl: mime_part_count $mime_part_count >>> = mime_acl: mime_part_count -1 -LOG: 10HmbA-0005vi-00 mime_acl: mime_part_count -1 +LOG: 10HmbA-000000005vi-0000 mime_acl: mime_part_count -1 >>> accept: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": ACCEPT -LOG: 10HmbA-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss +LOG: 10HmbA-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss diff --git a/test/stderr/4006 b/test/stderr/4006 index adfca5304..e4889c18d 100644 --- a/test/stderr/4006 +++ b/test/stderr/4006 @@ -1,3 +1,3 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: clamd TESTSUITE/eximdir/clam_sock : ClamAV returned: scanned_file_name: 666 ERROR -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: clamd TESTSUITE/eximdir/clam_sock : unable to read from socket (Connection timed out) -1999-03-02 09:44:33 10HmaZ-0005vi-00 malware acl condition: clamd TESTSUITE/eximdir/clam_sock : unable to read from socket (Connection timed out) +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: clamd TESTSUITE/eximdir/clam_sock : ClamAV returned: scanned_file_name: 666 ERROR +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: clamd TESTSUITE/eximdir/clam_sock : unable to read from socket (Connection timed out) +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 malware acl condition: clamd TESTSUITE/eximdir/clam_sock : unable to read from socket (Connection timed out) diff --git a/test/stderr/4007 b/test/stderr/4007 index 2a5493e96..c8dc2dcf4 100644 --- a/test/stderr/4007 +++ b/test/stderr/4007 @@ -1,7 +1,7 @@ ### (non-internal) scanner error -> paniclog -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner -1999-03-02 09:44:33 10HmaZ-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner ### internal scanner error, no panic log ******** SERVER ******** diff --git a/test/stderr/4008 b/test/stderr/4008 index f3193849f..078a9bf9c 100644 --- a/test/stderr/4008 +++ b/test/stderr/4008 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: cmdline : unable to read from scanner (TESTSUITE/aux-fixed/4008.script -o pause3 TESTSUITE/spool/scan/10HmaX-0005vi-00 2>&1): Connection timed out -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: cmdline : unable to read from scanner (TESTSUITE/aux-fixed/4008.script -o pause3 TESTSUITE/spool/scan/10HmaY-0005vi-00 2>&1): Connection timed out +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: cmdline : unable to read from scanner (TESTSUITE/aux-fixed/4008.script -o pause3 TESTSUITE/spool/scan/10HmaX-000000005vi-0000 2>&1): Connection timed out +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: cmdline : unable to read from scanner (TESTSUITE/aux-fixed/4008.script -o pause3 TESTSUITE/spool/scan/10HmaY-000000005vi-0000 2>&1): Connection timed out diff --git a/test/stderr/4009 b/test/stderr/4009 index 1de0ab5aa..781353d3b 100644 --- a/test/stderr/4009 +++ b/test/stderr/4009 @@ -1,3 +1,3 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: sophie TESTSUITE/eximdir/sophie_sock : scanner reported error -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: sophie TESTSUITE/eximdir/sophie_sock : unable to read from UNIX socket (TESTSUITE/eximdir/sophie_sock) -1999-03-02 09:44:33 10HmaZ-0005vi-00 malware acl condition: sophie TESTSUITE/eximdir/sophie_sock : unable to read from UNIX socket (TESTSUITE/eximdir/sophie_sock) +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: sophie TESTSUITE/eximdir/sophie_sock : scanner reported error +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: sophie TESTSUITE/eximdir/sophie_sock : unable to read from UNIX socket (TESTSUITE/eximdir/sophie_sock) +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 malware acl condition: sophie TESTSUITE/eximdir/sophie_sock : unable to read from UNIX socket (TESTSUITE/eximdir/sophie_sock) diff --git a/test/stderr/4010 b/test/stderr/4010 index 0efd096fb..a468187fb 100644 --- a/test/stderr/4010 +++ b/test/stderr/4010 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: fsecure TESTSUITE/eximdir/fsec_sock : unable to read answer 0 (Connection timed out) -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: fsecure TESTSUITE/eximdir/fsec_sock : unable to read answer 0 (Connection timed out) +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: fsecure TESTSUITE/eximdir/fsec_sock : unable to read answer 0 (Connection timed out) +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: fsecure TESTSUITE/eximdir/fsec_sock : unable to read answer 0 (Connection timed out) diff --git a/test/stderr/4011 b/test/stderr/4011 index a6521b25e..dd6b968c5 100644 --- a/test/stderr/4011 +++ b/test/stderr/4011 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unable to scan file TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml (Responded: 5xx defer). -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unavailable (Responded: nothing). -1999-03-02 09:44:33 10HmaZ-0005vi-00 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unavailable (Responded: nothing). -1999-03-02 09:44:33 10HmbA-0005vi-00 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unable to scan file TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml (Responded: 5xx defer). +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unable to scan file TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml (Responded: 5xx defer). +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unavailable (Responded: nothing). +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unavailable (Responded: nothing). +1999-03-02 09:44:33 10HmbA-000000005vi-0000 malware acl condition: aveserver TESTSUITE/eximdir/aveserver_sock : unable to scan file TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml (Responded: 5xx defer). diff --git a/test/stderr/4013 b/test/stderr/4013 index 73c3c0111..c6d7ac97d 100644 --- a/test/stderr/4013 +++ b/test/stderr/4013 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: f-prot6d [127.0.0.1]:1111 : unable to read from socket (Connection timed out) -1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: f-prot6d [127.0.0.1]:1111 : unable to read from socket (Connection timed out) +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: f-prot6d [127.0.0.1]:1111 : unable to read from socket (Connection timed out) +1999-03-02 09:44:33 10HmaY-000000005vi-0000 malware acl condition: f-prot6d [127.0.0.1]:1111 : unable to read from socket (Connection timed out) diff --git a/test/stderr/4017 b/test/stderr/4017 index 287cd30ce..24d075217 100644 --- a/test/stderr/4017 +++ b/test/stderr/4017 @@ -1,6 +1,6 @@ ### clean | multiline response ### scanner tmpfail -> defer -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied +1999-03-02 09:44:33 10HmaX-000000005vi-0000 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied ******** SERVER ******** ### clean | multiline response diff --git a/test/stderr/4031 b/test/stderr/4031 index b877f2e39..0bf58bede 100644 --- a/test/stderr/4031 +++ b/test/stderr/4031 @@ -32,7 +32,7 @@ LOG: remote [127.0.0.2]:1111 >>> accept: condition test succeeded in ACL "r_acl" >>> end of ACL "r_acl": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaX-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss +LOG: 10HmaX-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss ### protocol v1 receive >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -69,7 +69,7 @@ LOG: remote [127.0.0.2]:1113 >>> accept: condition test succeeded in ACL "r_acl" >>> end of ACL "r_acl": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaY-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss +LOG: 10HmaY-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss ### protocol v2 receive >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -106,7 +106,7 @@ LOG: remote [127.0.0.2]:1115 >>> accept: condition test succeeded in ACL "r_acl" >>> end of ACL "r_acl": ACCEPT >>> host in ignore_fromline_hosts? no (option unset) -LOG: 10HmaZ-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss +LOG: 10HmaZ-000000005vi-0000 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip4.ip4.ip4.ip4 S=sss ### proxy timeout >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) diff --git a/test/stderr/4052 b/test/stderr/4052 index b3264387d..83232342c 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -18,7 +18,7 @@ checking retry status of 127.0.0.1 no host retry record no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = usable -delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex) +delivering 10HmbP-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (extchange@test.ex) Transport port=25 replaced by host-specific port=PORT_D EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000 Using cached cleartext PIPECONNECT diff --git a/test/stderr/4507 b/test/stderr/4507 index bded5b697..6fcd8bd8d 100644 --- a/test/stderr/4507 +++ b/test/stderr/4507 @@ -20,18 +20,18 @@ >>> processing "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 +LOG: 10HmaX-000000005vi-0000 signer: test.ex bits: 1024 >>> warn: condition test succeeded in ACL "check_dkim" >>> processing "accept" (TESTSUITE/test-config 41) >>> 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 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 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 +LOG: 10HmaX-000000005vi-0000 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 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net diff --git a/test/stderr/4510 b/test/stderr/4510 index 0738f4491..da20c0d30 100644 --- a/test/stderr/4510 +++ b/test/stderr/4510 @@ -51,16 +51,16 @@ DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81 SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> - SMTP<< 250 OK id=10HmbL-0005vi-00 + SMTP<< 250 OK id=10HmbL-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00" + => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 failed to expand dkim_timestamps: unknown variable in "${bogus}" ******** SERVER ******** diff --git a/test/stderr/4530 b/test/stderr/4530 index 35423d58d..b0126b584 100644 --- a/test/stderr/4530 +++ b/test/stderr/4530 @@ -61,16 +61,16 @@ DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81 SMTP>> . SMTP>> QUIT cmd buf flush ddd bytes - SMTP<< 250 OK id=10HmbL-0005vi-00 + SMTP<< 250 OK id=10HmbL-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' LOG: MAIN - => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbL-0005vi-00" + => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbL-000000005vi-0000" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 failed to expand dkim_timestamps: unknown variable in "${bogus}" ******** SERVER ******** diff --git a/test/stderr/5000 b/test/stderr/5000 index 85fa2045a..843b20242 100644 --- a/test/stderr/5000 +++ b/test/stderr/5000 @@ -1,4 +1,4 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=localuser T=maildir_tagged_appendfile defer (-1): Expansion of "${if eq{0}{1}{rhubarb}" (maildir_tag for maildir_tagged_appendfile transport) failed: syntax error in "if" item - "fail" expected +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@myhost.test.ex R=localuser T=maildir_tagged_appendfile defer (-1): Expansion of "${if eq{0}{1}{rhubarb}" (maildir_tag for maildir_tagged_appendfile transport) failed: syntax error in "if" item - "fail" expected Exim version x.yz .... configuration file is TESTSUITE/test-config admin user diff --git a/test/stderr/5004 b/test/stderr/5004 index e1cb2a1ea..d92e7a7d2 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -27,27 +27,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -60,9 +60,9 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -142,7 +142,7 @@ search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail <TESTSUITE/test-mail> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 directory=TESTSUITE/test-mail format=maildir @@ -171,7 +171,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: TESTSUITE/test-mail: no retry items @@ -198,7 +198,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5005 b/test/stderr/5005 index 4a64d0438..b9512666c 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -25,27 +25,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <nofile@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -56,9 +56,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -117,7 +117,7 @@ search_tidyup called changed uid/gid: local delivery to nofile <nofile@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to nofile using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to nofile using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/nofile format=maildir @@ -166,7 +166,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: nofile@test.ex: no retry items @@ -183,7 +183,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -216,26 +216,26 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 @@ -246,9 +246,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -307,7 +307,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1239 home=NULL current=/ -set_process_info: pppp delivering 10HmaY-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/userx format=maildir @@ -358,7 +358,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1238 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -375,7 +375,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -408,26 +408,26 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D -Data file written for message 10HmaZ-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +Data file written for message 10HmaZ-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1241 @@ -438,9 +438,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaZ-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaZ-0005vi-00-D -reading spool file 10HmaZ-0005vi-00-H +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D +reading spool file 10HmaZ-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -499,7 +499,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1242 home=NULL current=/ -set_process_info: pppp delivering 10HmaZ-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/userx format=maildir @@ -544,7 +544,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1241 -set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000 Processing retry items Succeeded addresses: Failed addresses: @@ -573,11 +573,11 @@ Writing retry data for T:userx@test.ex closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H Size of headers = sss -end delivery of 10HmaZ-0005vi-00 +end delivery of 10HmaZ-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -610,26 +610,26 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D -Data file written for message 10HmbA-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +Data file written for message 10HmbA-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1244 @@ -640,9 +640,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmbA-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmbA-0005vi-00-D -reading spool file 10HmbA-0005vi-00-H +set_process_info: pppp delivering 10HmbA-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmbA-000000005vi-0000-D +reading spool file 10HmbA-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -709,7 +709,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1245 home=NULL current=/ -set_process_info: pppp delivering 10HmbA-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmbA-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=500 warning=0 directory=TESTSUITE/test-mail/userx format=maildir @@ -741,7 +741,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1244 -set_process_info: pppp tidying up after delivering 10HmbA-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmbA-000000005vi-0000 Processing retry items Succeeded addresses: Failed addresses: @@ -770,11 +770,11 @@ Writing retry data for T:userx@test.ex closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H Size of headers = sss -end delivery of 10HmbA-0005vi-00 +end delivery of 10HmbA-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1244 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5006 b/test/stderr/5006 index 4194360f1..25a76f693 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -25,27 +25,27 @@ rewrite headers From: CALLER_NAME <CALLER@test.ex> search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 @@ -56,9 +56,9 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -117,7 +117,7 @@ search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=50% directory=TESTSUITE/test-mail/userx format=maildir @@ -164,7 +164,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -181,7 +181,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5403 b/test/stderr/5403 index 1858fcd59..f5f7a3831 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -31,7 +31,7 @@ LOG: rcpt for plain@domain.com >>> processing "accept" (TESTSUITE/test-config 25) >>> accept: condition test succeeded in ACL "ar" >>> end of ACL "ar": ACCEPT -LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com +LOG: 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -118,4 +118,4 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP(close)>> >>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220' >>> ----------- cutthrough shutdown (host-checking mode) ------------ -LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com +LOG: 10HmaY-000000005vi-0000 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com diff --git a/test/stderr/5410 b/test/stderr/5410 index c5db2f1e8..044734f76 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -562,7 +562,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaX-0005vi-00 + ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -593,7 +593,7 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- @@ -602,9 +602,9 @@ end of inline ACL: ACCEPT ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaY-0005vi-00 + SMTP<< 250 OK id=10HmaY-000000005vi-0000 LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -1132,7 +1132,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaZ-0005vi-00 + ├──────value: 10HmaZ-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -1163,7 +1163,7 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for usery@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- @@ -1172,9 +1172,9 @@ end of inline ACL: ACCEPT ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP<< 250 OK id=10HmbA-000000005vi-0000 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -1702,7 +1702,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmbB-0005vi-00 + ├──────value: 10HmbB-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -1733,7 +1733,7 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for usery@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- @@ -1742,9 +1742,9 @@ end of inline ACL: ACCEPT ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbC-0005vi-00 + SMTP<< 250 OK id=10HmbC-000000005vi-0000 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> diff --git a/test/stderr/5420 b/test/stderr/5420 index 01633802a..535542d26 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -562,7 +562,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaX-0005vi-00 + ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -593,7 +593,7 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- @@ -602,9 +602,9 @@ end of inline ACL: ACCEPT ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaY-0005vi-00 + SMTP<< 250 OK id=10HmaY-000000005vi-0000 LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -1132,7 +1132,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaZ-0005vi-00 + ├──────value: 10HmaZ-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -1163,7 +1163,7 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for usery@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- @@ -1172,9 +1172,9 @@ end of inline ACL: ACCEPT ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP<< 250 OK id=10HmbA-000000005vi-0000 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -1702,7 +1702,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmbB-0005vi-00 + ├──────value: 10HmbB-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -1733,7 +1733,7 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for usery@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- @@ -1742,9 +1742,9 @@ end of inline ACL: ACCEPT ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbC-0005vi-00 + SMTP<< 250 OK id=10HmbC-000000005vi-0000 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> diff --git a/test/stderr/5700 b/test/stderr/5700 index 224bda7d8..b4007714d 100644 --- a/test/stderr/5700 +++ b/test/stderr/5700 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: ERROR from acl "logger" +1999-03-02 09:44:33 10HmaX-000000005vi-0000 failed to expand event_action msg:delivery in smtp: ERROR from acl "logger" diff --git a/test/stderr/5900 b/test/stderr/5900 index 70058d78e..bcc223296 100644 --- a/test/stderr/5900 +++ b/test/stderr/5900 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory diff --git a/test/stderr/5901 b/test/stderr/5901 index 111bae495..67007250c 100644 --- a/test/stderr/5901 +++ b/test/stderr/5901 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (-1): scan transport directory: test-mail/subdir is not absolute +1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@test.ex R=scan T=scan defer (-1): scan transport directory: test-mail/subdir is not absolute |