Rewrites: avoid a split log line when rewiting hits a malformed address. Bug 3160
[exim.git] / test / stderr / 5005
index c7cc3453962a0155ef658c0a0c8556e93606d1b2..d9041e69fe15c853c932b11058a8a62ef14e741e 100644 (file)
@@ -19,33 +19,33 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ 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
@@ -130,6 +130,7 @@ created directory TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile/tmp
 created directory TESTSUITE/test-mail/nofile/new
 created directory TESTSUITE/test-mail/nofile/cur
+compiling RE '^(?:cur|new|\..*)$'
 using regex for maildir directory selection: ^(?:cur|new|\..*)$
 looking for maildirsize in TESTSUITE/test-mail/nofile
 TESTSUITE/test-mail/nofile/maildirsize does not exist: recalculating
@@ -165,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
@@ -182,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 >>>>>>>>>>>>>>>>
@@ -209,32 +210,32 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ 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
@@ -245,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:
@@ -306,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
@@ -318,6 +319,7 @@ ensuring maildir directories exist in TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx/tmp
 created directory TESTSUITE/test-mail/userx/new
 created directory TESTSUITE/test-mail/userx/cur
+compiling RE '^(?:cur|new|\..*)$'
 using regex for maildir directory selection: ^(?:cur|new|\..*)$
 looking for maildirsize in TESTSUITE/test-mail/userx
 reading quota parameters from maildirsize data
@@ -356,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
@@ -373,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 >>>>>>>>>>>>>>>>
@@ -400,32 +402,32 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ 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
@@ -436,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:
@@ -497,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
@@ -506,6 +508,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   maildir_use_size_file=yes
 de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
+compiling RE '^(?:cur|new|\..*)$'
 using regex for maildir directory selection: ^(?:cur|new|\..*)$
 looking for maildirsize in TESTSUITE/test-mail/userx
 reading quota parameters from maildirsize data
@@ -541,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:
@@ -552,9 +555,13 @@ Deferred addresses:
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- address match test: subject=userx@test.ex pattern=*
- test.ex in "*"? yes (matched "*")
- userx@test.ex in "*"? yes (matched "*")
+ userx@test.ex in "*"?
+  list element: *
+  address match test: subject=userx@test.ex pattern=*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  userx@test.ex in "*"? yes (matched "*")
 retry for T:userx@test.ex = * 0 0
  dbfn_read: key=T:userx@test.ex
 failing_interval=ttt message_age=ttt
@@ -566,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 >>>>>>>>>>>>>>>>
@@ -597,32 +604,32 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ 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
@@ -633,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:
@@ -702,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
@@ -711,6 +718,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   maildir_use_size_file=yes
 de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
+compiling RE '^(?:cur|new|\..*)$'
 using regex for maildir directory selection: ^(?:cur|new|\..*)$
 looking for maildirsize in TESTSUITE/test-mail/userx
 reading quota parameters from maildirsize data
@@ -733,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:
@@ -744,9 +752,13 @@ Deferred addresses:
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- address match test: subject=userx@test.ex pattern=*
- test.ex in "*"? yes (matched "*")
- userx@test.ex in "*"? yes (matched "*")
+ userx@test.ex in "*"?
+  list element: *
+  address match test: subject=userx@test.ex pattern=*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  userx@test.ex in "*"? yes (matched "*")
 retry for T:userx@test.ex = * 0 0
  dbfn_read: key=T:userx@test.ex
 failing_interval=ttt message_age=ttt
@@ -758,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 >>>>>>>>>>>>>>>>