X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0c6608531368096bafebac4e488f84891368b006..5d5ad9fb16a2511ff2e0e7d4528d399f06f608da:/test/stderr/4001?ds=sidebyside

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