tidying

[exim.git] / test / stderr / 5005

diff --git a/test/stderr/5005 b/test/stderr/5005
index b9512666c65a2c3e7fbf2ce9935d9f84b56535d2..603ad30f6e7505964325563aa1d30aaa32bcc4f8 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config


@@ -19,15 +20,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>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:
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-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
+ 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-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000


@@ -47,6 +48,7 @@ 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-000000005vi-0000
 Exim version x.yz ....
 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-000000005vi-0000
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
 configuration file is TESTSUITE/test-config


@@ -70,8 +72,6 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   nofile@test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   nofile@test.ex 

- 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
  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


@@ -79,8 +79,9 @@ no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: nofile@test.ex
 unique = nofile@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: nofile@test.ex
 unique = nofile@test.ex

-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record

 nofile@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing nofile@test.ex
 nofile@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing nofile@test.ex


@@ -107,8 +108,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> nofile@test.ex <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> nofile@test.ex <--------

- 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
  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


@@ -124,7 +123,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes

-de-tainting path 'TESTSUITE/test-mail/nofile'
+below-home: de-tainting path 'TESTSUITE/test-mail/nofile'

 ensuring maildir directories exist in TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile/tmp
 ensuring maildir directories exist in TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile/tmp


@@ -157,6 +156,7 @@ renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called

+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 journalling nofile@test.ex
 t1 transport returned OK for nofile@test.ex
 post-process nofile@test.ex (0)
 journalling nofile@test.ex
 t1 transport returned OK for nofile@test.ex
 post-process nofile@test.ex (0)


@@ -168,10 +168,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items

-Succeeded addresses:
- nofile@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  nofile@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:

 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: nofile@test.ex
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: nofile@test.ex


@@ -190,6 +190,7 @@ search_tidyup called
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
 configuration file is TESTSUITE/test-config


@@ -210,15 +211,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>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:
  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@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-000000005vi-0000-D
 Data file written for message 10HmaY-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
 Data file written for message 10HmaY-000000005vi-0000


@@ -237,6 +238,7 @@ LOG: MAIN
 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-000000005vi-0000
 Exim version x.yz ....
 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-000000005vi-0000
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1238
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1238
 configuration file is TESTSUITE/test-config


@@ -260,8 +262,6 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 

- 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
  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


@@ -269,8 +269,9 @@ no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex

-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record

 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex


@@ -297,8 +298,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

- 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
  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


@@ -314,7 +313,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes

-de-tainting path 'TESTSUITE/test-mail/userx'
+below-home: de-tainting path 'TESTSUITE/test-mail/userx'

 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx/tmp
 created directory TESTSUITE/test-mail/userx/new
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx/tmp
 created directory TESTSUITE/test-mail/userx/new


@@ -349,6 +348,7 @@ renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called

+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 journalling userx@test.ex
 t1 transport returned OK for userx@test.ex
 post-process userx@test.ex (0)
 journalling userx@test.ex
 t1 transport returned OK for userx@test.ex
 post-process userx@test.ex (0)


@@ -360,10 +360,10 @@ 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
 Processing retry items
   uid=EXIM_UID gid=EXIM_GID pid=p1238
 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 Processing retry items

-Succeeded addresses:
- userx@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:

 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@test.ex
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@test.ex


@@ -382,6 +382,7 @@ search_tidyup called
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1240
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1240
 configuration file is TESTSUITE/test-config


@@ -402,15 +403,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>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:
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-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
+ 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-000000005vi-0000-D
 Data file written for message 10HmaZ-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D
 Data file written for message 10HmaZ-000000005vi-0000


@@ -429,6 +430,7 @@ LOG: MAIN
 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-000000005vi-0000
 Exim version x.yz ....
 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-000000005vi-0000
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1241
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1241
 configuration file is TESTSUITE/test-config


@@ -452,8 +454,6 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 

- 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
  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


@@ -461,8 +461,9 @@ no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex

-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record

 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex


@@ -489,8 +490,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

- 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
  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


@@ -506,7 +505,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes

-de-tainting path 'TESTSUITE/test-mail/userx'
+below-home: 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|\..*)$
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 compiling RE '^(?:cur|new|\..*)$'
 using regex for maildir directory selection: ^(?:cur|new|\..*)$


@@ -536,6 +535,7 @@ maildir: time since "new" directory modified = 10s
 Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
 appendfile yields 1 with errno=-22 more_errno=dd
 search_tidyup called
 Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
 appendfile yields 1 with errno=-22 more_errno=dd
 search_tidyup called

+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 t1 transport returned DEFER for userx@test.ex
 added retry item for T:userx@test.ex: errno=-22 more_errno=dd flags=0
 post-process userx@test.ex (1)
 t1 transport returned DEFER for userx@test.ex
 added retry item for T:userx@test.ex: errno=-22 more_errno=dd flags=0
 post-process userx@test.ex (1)


@@ -546,31 +546,30 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1241
 set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000
 Processing retry items
   uid=EXIM_UID gid=EXIM_GID pid=p1241
 set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000
 Processing retry items

-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@test.ex
- 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_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- 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
-Writing retry data for T:userx@test.ex
-  first failed=dddd last try=dddd next try=+86400 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
- dbfn_write: key=T:userx@test.ex
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database and lockfile
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@test.ex
+   ╎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
+   ╎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
+   ╎dbfn_read: null return
+   ╎failing_interval=ttt message_age=ttt
+   ╎Writing retry data for T:userx@test.ex
+   ╎  first failed=dddd last try=dddd next try=+86400 expired=0
+   ╎  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
+   ╎dbfn_write: key=T:userx@test.ex datalen nn
+  EXIM_DBCLOSE(0xAAAAAAAA)
+  closed hints database

 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000
 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000


@@ -584,6 +583,7 @@ search_tidyup called
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1243
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1243
 configuration file is TESTSUITE/test-config


@@ -604,15 +604,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>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:
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-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
+ 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-000000005vi-0000-D
 Data file written for message 10HmbA-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D
 Data file written for message 10HmbA-000000005vi-0000


@@ -631,6 +631,7 @@ LOG: MAIN
 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-000000005vi-0000
 Exim version x.yz ....
 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-000000005vi-0000
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1244
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1244
 configuration file is TESTSUITE/test-config


@@ -654,22 +655,24 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 

- 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: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex

- dbfn_read: key=R:test.ex
- dbfn_read: key=R:userx@test.ex
- dbfn_read: key=R:userx@test.ex:<CALLER@test.ex>
-no   domain  retry record
-no   address retry record
+ checking router retry status
+  dbfn_read: key=R:test.ex
+  dbfn_read: null return
+  dbfn_read: key=R:userx@test.ex
+  dbfn_read: null return
+  dbfn_read: key=R:userx@test.ex:<CALLER@test.ex>
+  dbfn_read: null return
+  no   domain  retry record
+  no   address retry record

 userx@test.ex: queued for routing
  EXIM_DBCLOSE(0xAAAAAAAA)
 userx@test.ex: queued for routing
  EXIM_DBCLOSE(0xAAAAAAAA)

- closed hints database and lockfile
+ closed hints database

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------


@@ -695,16 +698,15 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

- 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: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
  dbfn_read: key=T:userx@test.ex
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
  dbfn_read: key=T:userx@test.ex

+ dbfn_read: size nnn return

 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
  EXIM_DBCLOSE(0xAAAAAAAA)
 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
  EXIM_DBCLOSE(0xAAAAAAAA)

- closed hints database and lockfile
+ closed hints database

 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=p1245
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=p1245


@@ -716,7 +718,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes

-de-tainting path 'TESTSUITE/test-mail/userx'
+below-home: 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|\..*)$
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 compiling RE '^(?:cur|new|\..*)$'
 using regex for maildir directory selection: ^(?:cur|new|\..*)$


@@ -733,6 +735,7 @@ maildir: time since "new" directory modified = 10s
 Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
 appendfile yields 1 with errno=-22 more_errno=dd
 search_tidyup called
 Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
 appendfile yields 1 with errno=-22 more_errno=dd
 search_tidyup called

+>>>>>>>>>>>>>>>> Exim pid=p1245 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 t1 transport returned DEFER for userx@test.ex
 added retry item for T:userx@test.ex: errno=-22 more_errno=dd flags=0
 post-process userx@test.ex (1)
 t1 transport returned DEFER for userx@test.ex
 added retry item for T:userx@test.ex: errno=-22 more_errno=dd flags=0
 post-process userx@test.ex (1)


@@ -743,31 +746,30 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1244
 set_process_info: pppp tidying up after delivering 10HmbA-000000005vi-0000
 Processing retry items
   uid=EXIM_UID gid=EXIM_GID pid=p1244
 set_process_info: pppp tidying up after delivering 10HmbA-000000005vi-0000
 Processing retry items

-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@test.ex
- 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_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- 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
-Writing retry data for T:userx@test.ex
-  first failed=dddd last try=dddd next try=+86400 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
- dbfn_write: key=T:userx@test.ex
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database and lockfile
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@test.ex
+   ╎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
+   ╎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
+   ╎dbfn_read: size nnn return
+   ╎failing_interval=ttt message_age=ttt
+   ╎Writing retry data for T:userx@test.ex
+   ╎  first failed=dddd last try=dddd next try=+86400 expired=0
+   ╎  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
+   ╎dbfn_write: key=T:userx@test.ex datalen nn
+  EXIM_DBCLOSE(0xAAAAAAAA)
+  closed hints database

 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000
 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000