Copyright updates:
[exim.git] / test / stderr / 0403
index 0f5338b384971536785676bf2f77e88afdd9b078..ae038834744a66dc180d7cac4b949ba08874e526 100644 (file)
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 Sender: CALLER@test.ex
 Recipients:
   userx@test.ex
 search_tidyup called
 >>Headers received:
 
 Sender: CALLER@test.ex
 Recipients:
   userx@test.ex
 search_tidyup called
 >>Headers received:
 
-rewrite_one_header: type=F:
-  From: CALLER_NAME <CALLER@test.ex>
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
+ rewrite_one_header: type=F:
+   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
 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
 
 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>)
 >>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
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
-Writing spool header file: TESTSUITE/spool//input//hdr.pppp
-DSN: Write SPOOL :-dsn_envid NULL
-DSN: Write SPOOL :-dsn_ret 0
-DSN: Flags :0
-DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
-Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
+       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-000000005vi-0000
+DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
+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
 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=0xfbb95cfd -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
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=EXIM_GID pid=pppp
+  uid=uuuu gid=EXIM_GID pid=p1235
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
+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
 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:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
-Empty Tree
+ Empty Tree
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
-DSN: set orcpt: NULL  flags: 0
+body_linecount=0 message_linecount=8
+DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
 Delivery address list:
   userx@test.ex 
-locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN(TESTSUITE/spool/db/retry)
-returned from EXIM_DBOPEN
-ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
+ 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
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
-search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
-search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0403.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="test.ex"
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0403.data
-lookup yielded: [DOMAINDATA_test.ex]
-test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
+  search_open: lsearch "TESTSUITE/aux-fixed/0403.accountfile"
+  search_find: file="TESTSUITE/aux-fixed/0403.accountfile"
+    key="userx@test.ex" partial=-1 affix=NULL starflags=0 opts="ret=key"
+  LRU list:
+    0TESTSUITE/aux-fixed/0403.accountfile
+    End
+  internal_search_find: file="TESTSUITE/aux-fixed/0403.accountfile"
+    type=lsearch key="userx@test.ex" opts=NULL
+  file lookup required for userx@test.ex
+    in TESTSUITE/aux-fixed/0403.accountfile
+  creating new cache entry
+  lookup failed
+test.ex in ""?
+test.ex in ""? no (end of list)
+r1 router skipped: domains mismatch
+--------> r2 router <--------
+local_part=userx domain=test.ex
+checking domains
+test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"?
+ list element: lsearch;TESTSUITE/aux-fixed/0403.data
+ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
+ search_find: file="TESTSUITE/aux-fixed/0403.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0403.data
+   0TESTSUITE/aux-fixed/0403.accountfile
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
+   type=lsearch key="test.ex" opts=NULL
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0403.data
+ creating new cache entry
+ lookup yielded: [DOMAINDATA_test.ex]
+ test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
 checking local_parts
 checking local_parts
-search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="userx" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0403.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="userx"
-file lookup required for userx
-  in TESTSUITE/aux-fixed/0403.data
-lookup yielded: [LOCALPARTDATA_userx]
-userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
+userx in "lsearch;TESTSUITE/aux-fixed/0403.data"?
+ list element: lsearch;TESTSUITE/aux-fixed/0403.data
+ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0403.data"
+   key="userx" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0403.data
+   0TESTSUITE/aux-fixed/0403.accountfile
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
+   type=lsearch key="userx" opts=NULL
+ file lookup required for userx
+   in TESTSUITE/aux-fixed/0403.data
+ creating new cache entry
+ lookup yielded: [LOCALPARTDATA_userx]
+ userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
 +++ROUTER:
 +++domain_data=[DOMAINDATA_test.ex]
 +++local_part_data=[LOCALPARTDATA_userx]
 +++address_data=
 +++home=/usr
 processing address_data
 +++ROUTER:
 +++domain_data=[DOMAINDATA_test.ex]
 +++local_part_data=[LOCALPARTDATA_userx]
 +++address_data=
 +++home=/usr
 processing address_data
-calling r1 router
-rda_interpret (string): TESTSUITE/test-mail/junk
-expanded: TESTSUITE/test-mail/junk
+calling r2 router
+rda_interpret (string): 'TESTSUITE/test-mail/junk'
+expanded: 'TESTSUITE/test-mail/junk'
 file is not a filter file
 parse_forward_list: TESTSUITE/test-mail/junk
 extract item: TESTSUITE/test-mail/junk
 set transport t1
 file is not a filter file
 parse_forward_list: TESTSUITE/test-mail/junk
 extract item: TESTSUITE/test-mail/junk
 set transport t1
-r1 router generated TESTSUITE/test-mail/junk
+r2 router generated TESTSUITE/test-mail/junk
   pipe, file, or autoreply
   errors_to=NULL transport=t1
   uid=unset gid=unset home=/usr
   pipe, file, or autoreply
   errors_to=NULL transport=t1
   uid=unset gid=unset home=/usr
-routed by r1 router
+routed by r2 router
   envelope to: userx@test.ex
   transport: <none>
   envelope to: userx@test.ex
   transport: <none>
-locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN(TESTSUITE/spool/db/retry)
-returned from EXIM_DBOPEN
+ 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
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/junk
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/junk
@@ -152,16 +179,17 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> TESTSUITE/test-mail/junk <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> TESTSUITE/test-mail/junk <--------
-locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
-EXIM_DBOPEN(TESTSUITE/spool/db/retry)
-returned from EXIM_DBOPEN
+ 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
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1
 no retry data available
 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=pppp
+  uid=CALLER_UID gid=CALLER_GID pid=p1236
   home=/usr current=/usr
   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]
 +++TRANSPORT:
 +++domain_data=[DOMAINDATA_test.ex]
 +++local_part_data=[LOCALPARTDATA_userx]
@@ -182,32 +210,252 @@ post-process TESTSUITE/test-mail/junk (0)
 TESTSUITE/test-mail/junk delivered
 userx@test.ex: children all complete
 LOG: MAIN
 TESTSUITE/test-mail/junk delivered
 userx@test.ex: children all complete
 LOG: MAIN
-  *> TESTSUITE/test-mail/junk <userx@test.ex> R=r1 T=t1
+  *> TESTSUITE/test-mail/junk <userx@test.ex> R=r2 T=t1
 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 changed uid/gid: post-delivery tidying
 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 changed uid/gid: post-delivery tidying
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
-set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-DSN: processing router : r1
+  uid=EXIM_UID gid=EXIM_GID pid=p1235
+set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
+DSN: processing router : r2
 DSN: processing successful delivery address: TESTSUITE/test-mail/junk
 DSN: Sender_address: CALLER@test.ex
 DSN: processing successful delivery address: TESTSUITE/test-mail/junk
 DSN: Sender_address: CALLER@test.ex
-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: TESTSUITE/test-mail/junk
 DSN: Remote SMTP server supports DSN: 0
 DSN: not sending DSN success message
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: TESTSUITE/test-mail/junk
 DSN: Remote SMTP server supports DSN: 0
 DSN: not sending DSN success message
-DSN: processing router : r1
+DSN: processing router : r2
 DSN: processing successful delivery address: userx@test.ex
 DSN: Sender_address: CALLER@test.ex
 DSN: processing successful delivery address: userx@test.ex
 DSN: Sender_address: CALLER@test.ex
-DSN: orcpt: NULL  flags: 0
+DSN: orcpt: NULL  flags: 0x0
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: userx@test.ex
 DSN: Remote SMTP server supports DSN: 0
 DSN: not sending DSN success message
 LOG: MAIN
   Completed
 DSN: envid: NULL  ret: 0
 DSN: Final recipient: userx@test.ex
 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 >>>>>>>>>>>>>>>>
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+### _data from a multi-step expansion
+Exim version x.yz ....
+changed uid/gid: forcing real = effective
+  uid=uuuu gid=CALLER_GID pid=p1237
+configuration file is TESTSUITE/test-config
+admin user
+changed uid/gid: privilege not needed
+  uid=EXIM_UID gid=EXIM_GID pid=p1237
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
+originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
+sender address = CALLER@test.ex
+set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
+Sender: CALLER@test.ex
+Recipients:
+  charlie@dom1.ain
+search_tidyup called
+>>Headers received:
+
+qualify & rewrite recipients list
+global rewrite rules
+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-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-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-000000005vi-0000
+       for charlie@dom1.ain;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
+DSN: **** SPOOL_OUT - address: <charlie@dom1.ain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
+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-000000005vi-0000
+Exim version x.yz ....
+changed uid/gid: forcing real = effective
+  uid=uuuu gid=EXIM_GID pid=p1238
+configuration file is TESTSUITE/test-config
+trusted user
+admin user
+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-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:
+ Empty Tree
+---- End of tree ----
+recipients_count=1
+**** SPOOL_IN - No additional fields
+body_linecount=0 message_linecount=8
+DSN: set orcpt:   flags: 0x0
+Delivery address list:
+  charlie@dom1.ain 
+ 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
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+no retry data available
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+Considering: charlie@dom1.ain
+unique = charlie@dom1.ain
+no   domain  retry record
+no   address retry record
+charlie@dom1.ain: queued for routing
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+routing charlie@dom1.ain
+--------> r1 router <--------
+local_part=charlie domain=dom1.ain
+checking domains
+  search_open: lsearch "TESTSUITE/aux-fixed/0403.accountfile"
+  search_find: file="TESTSUITE/aux-fixed/0403.accountfile"
+    key="charlie@dom1.ain" partial=-1 affix=NULL starflags=0 opts="ret=key"
+  LRU list:
+    0TESTSUITE/aux-fixed/0403.accountfile
+    End
+  internal_search_find: file="TESTSUITE/aux-fixed/0403.accountfile"
+    type=lsearch key="charlie@dom1.ain" opts=NULL
+  file lookup required for charlie@dom1.ain
+    in TESTSUITE/aux-fixed/0403.accountfile
+  creating new cache entry
+  lookup yielded: 
+dom1.ain in "dom1.ain"?
+ list element: dom1.ain
+ dom1.ain in "dom1.ain"? yes (matched "dom1.ain")
+checking local_parts
+  search_open: lsearch "TESTSUITE/aux-fixed/0403.accountfile"
+    cached open
+  search_find: file="TESTSUITE/aux-fixed/0403.accountfile"
+    key="charlie@dom1.ain" partial=-1 affix=NULL starflags=0 opts="ret=key"
+  LRU list:
+    0TESTSUITE/aux-fixed/0403.accountfile
+    End
+  internal_search_find: file="TESTSUITE/aux-fixed/0403.accountfile"
+    type=lsearch key="charlie@dom1.ain" opts=NULL
+  cached data used for lookup of charlie@dom1.ain
+    in TESTSUITE/aux-fixed/0403.accountfile
+  lookup yielded: 
+charlie in "charlie"?
+ list element: charlie
+ charlie in "charlie"? yes (matched "charlie")
++++ROUTER:
++++domain_data=dom1.ain
++++local_part_data=charlie
+calling r1 router
+rda_interpret (string): 'TESTSUITE/test-mail/junk'
+expanded: 'TESTSUITE/test-mail/junk'
+file is not a filter file
+parse_forward_list: TESTSUITE/test-mail/junk
+extract item: TESTSUITE/test-mail/junk
+set transport t1
+r1 router generated TESTSUITE/test-mail/junk
+  pipe, file, or autoreply
+  errors_to=NULL transport=t1
+  uid=unset gid=unset home=NULL
+routed by r1 router
+  envelope to: charlie@dom1.ain
+  transport: <none>
+ 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
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+no retry data available
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+Considering: TESTSUITE/test-mail/junk
+unique = TESTSUITE/test-mail/junk:charlie@dom1.ain
+queued for t1 transport
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+After routing:
+  Local deliveries:
+    TESTSUITE/test-mail/junk
+  Remote deliveries:
+  Failed addresses:
+  Deferred addresses:
+search_tidyup called
+>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
+--------> TESTSUITE/test-mail/junk <--------
+ 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
+ returned from EXIM_DBOPEN: (nil)
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
+no retry data available
+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=p1239
+  home=NULL current=/
+set_process_info: pppp delivering 10HmaY-000000005vi-0000 to TESTSUITE/test-mail/junk using t1
++++TRANSPORT:
++++domain_data=dom1.ain
++++local_part_data=charlie
++++address_data=
++++home=
+appendfile transport entered
+appendfile: mode=600 notify_comsat=0 quota=0 warning=0
+  file=TESTSUITE/test-mail/junk format=unix
+  message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
+  message_suffix=\n
+  maildir_use_size_file=no
+  locking by lockfile fcntl 
+*** delivery by t1 transport bypassed by -N option
+search_tidyup called
+journalling TESTSUITE/test-mail/junk:charlie@dom1.ain
+t1 transport returned OK for TESTSUITE/test-mail/junk
+post-process TESTSUITE/test-mail/junk (0)
+TESTSUITE/test-mail/junk delivered
+charlie@dom1.ain: children all complete
+LOG: MAIN
+  *> TESTSUITE/test-mail/junk <charlie@dom1.ain> R=r1 T=t1
+>>>>>>>>>>>>>>>> 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-000000005vi-0000
+DSN: processing router : r1
+DSN: processing successful delivery address: TESTSUITE/test-mail/junk
+DSN: Sender_address: CALLER@test.ex
+DSN: orcpt: NULL  flags: 0x0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: TESTSUITE/test-mail/junk
+DSN: Remote SMTP server supports DSN: 0
+DSN: not sending DSN success message
+DSN: processing router : r1
+DSN: processing successful delivery address: charlie@dom1.ain
+DSN: Sender_address: CALLER@test.ex
+DSN: orcpt: NULL  flags: 0x0
+DSN: envid: NULL  ret: 0
+DSN: Final recipient: charlie@dom1.ain
+DSN: Remote SMTP server supports DSN: 0
+DSN: not sending DSN success message
+LOG: MAIN
+  Completed
+end delivery of 10HmaY-000000005vi-0000
 search_tidyup called
 search_tidyup called
 search_tidyup called
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+
+******** SERVER ********
+### _data from a multi-step expansion