[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

トップ ページ
このメッセージを削除
このメッセージに返信
著者: Philip Hazel
日付:  
To: exim-cvs
題目: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src dbfn.c exim/exim-test-orig/AutoTest/stderr 313 317 418 447 451 463 466 468 469 470 474 503 517 536 568 581
ph10 2005/06/22 15:45:06 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         dbfn.c 
    exim-test-orig/AutoTest/stderr 313 317 418 447 451 463 466 468 
                                   469 470 474 503 517 536 568 581 
  Log:
  Put debug statements on either side of EXIM_DBOPEN() so as to pin down
  crashes while opening hints files.


  Revision  Changes    Path
  1.168     +5 -0      exim/exim-doc/doc-txt/ChangeLog
  1.4       +7 -1      exim/exim-src/src/dbfn.c
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/313
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/317
  1.4       +8 -0      exim/exim-test-orig/AutoTest/stderr/418
  1.4       +8 -0      exim/exim-test-orig/AutoTest/stderr/447
  1.7       +12 -0     exim/exim-test-orig/AutoTest/stderr/451
  1.3       +6 -0      exim/exim-test-orig/AutoTest/stderr/463
  1.4       +6 -0      exim/exim-test-orig/AutoTest/stderr/466
  1.5       +14 -0     exim/exim-test-orig/AutoTest/stderr/468
  1.4       +6 -0      exim/exim-test-orig/AutoTest/stderr/469
  1.7       +10 -0     exim/exim-test-orig/AutoTest/stderr/470
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/474
  1.3       +6 -0      exim/exim-test-orig/AutoTest/stderr/503
  1.5       +20 -0     exim/exim-test-orig/AutoTest/stderr/517
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/536
  1.4       +4 -0      exim/exim-test-orig/AutoTest/stderr/568
  1.7       +16 -0     exim/exim-test-orig/AutoTest/stderr/581


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- ChangeLog    22 Jun 2005 10:17:22 -0000    1.167
  +++ ChangeLog    22 Jun 2005 14:45:05 -0000    1.168
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.167 2005/06/22 10:17:22 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.168 2005/06/22 14:45:05 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -175,6 +175,11 @@
PH/23 Added daemon_startup_retries and daemon_startup_sleep.

   PH/24 Added ${if match_ip condition.
  +
  +PH/25 Put debug statements on either side of calls to EXIM_DBOPEN() for hints
  +      databases so that it will be absolutely obvious if a crash occurs in the
  +      DB library. This is a regular occurrence (often caused by mis-matched
  +      db.h files).



Exim version 4.51

  Index: dbfn.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/dbfn.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dbfn.c    14 Jun 2005 10:32:01 -0000    1.3
  +++ dbfn.c    22 Jun 2005 14:45:05 -0000    1.4
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.3 2005/06/14 10:32:01 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.4 2005/06/22 14:45:05 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -152,10 +152,15 @@
   exclusive access to the database, so we can go ahead and open it. If we are
   expected to create it, don't do so at first, again so that we can detect
   whether we need to change its ownership (see comments about the lock file
  -above.) */
  +above.) There have been regular reports of crashes while opening hints
  +databases - often this is caused by non-matching db.h and the library. To make
  +it easy to pin this down, there are now debug statements on either side of the
  +open call. */


sprintf(CS buffer, "%s/db/%s", spool_directory, name);
+DEBUG(D_hints_lookup) debug_printf("EXIM_DBOPEN(%s)\n", buffer);
EXIM_DBOPEN(buffer, flags, EXIMDB_MODE, &(dbblock->dbptr));
+DEBUG(D_hints_lookup) debug_printf("returned from EXIM_DBOPEN\n");

   if (dbblock->dbptr == NULL && errno == ENOENT && flags == O_RDWR)
     {
  @@ -163,6 +168,7 @@
       debug_printf("%s appears not to exist: trying to create\n", buffer);
     created = TRUE;
     EXIM_DBOPEN(buffer, flags|O_CREAT, EXIMDB_MODE, &(dbblock->dbptr));
  +  DEBUG(D_hints_lookup) debug_printf("returned from EXIM_DBOPEN\n");
     }


save_errno = errno;

  Index: 313
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/313,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 313    6 Apr 2005 10:06:14 -0000    1.3
  +++ 313    22 Jun 2005 14:45:06 -0000    1.4
  @@ -168,6 +168,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -275,6 +277,8 @@
--------> ph10@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1

  Index: 317
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/317,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 317    6 Apr 2005 10:06:14 -0000    1.3
  +++ 317    22 Jun 2005 14:45:06 -0000    1.4
  @@ -126,6 +126,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -187,6 +189,8 @@
--------> ph10@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1

  Index: 418
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/418,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 418    6 Apr 2005 10:06:14 -0000    1.3
  +++ 418    22 Jun 2005 14:45:06 -0000    1.4
  @@ -73,6 +73,8 @@
     kilos@thishost 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: kilos@thishost
@@ -107,6 +109,8 @@
re-routed to kilos@???
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   Considering: kilos@???
  @@ -144,6 +148,8 @@
     transport: <none>
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: kilos@???
@@ -190,6 +196,8 @@
--------> kilos@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to kilos <kilos@???> transport=t2

  Index: 447
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/447,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 447    6 Apr 2005 10:06:14 -0000    1.3
  +++ 447    22 Jun 2005 14:45:06 -0000    1.4
  @@ -226,6 +226,8 @@
     2@b 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
  @@ -261,6 +263,8 @@
   --------> 2@b <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to 2 <2@b> transport=t1
  @@ -383,6 +387,8 @@
     2@b 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: 2@b
@@ -417,6 +423,8 @@
--------> 2@b <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to 2 <2@b> transport=t1

  Index: 451
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/451,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 451    3 May 2005 14:20:01 -0000    1.6
  +++ 451    22 Jun 2005 14:45:06 -0000    1.7
  @@ -12,6 +12,8 @@
   set_process_info: 21680 delivering 10HmaX-0005vi-00
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -80,6 +82,8 @@
checking status of 127.0.0.1
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
127.0.0.1 [127.0.0.1]:1111 status = usable
127.0.0.1 in serialize_hosts? no (option unset)
@@ -119,6 +123,8 @@
checking status of 10.0.0.0
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
10.0.0.0 [10.0.0.0]:1111 status = usable
10.0.0.0 in serialize_hosts? no (option unset)
@@ -134,6 +140,8 @@
all IP addresses skipped or deferred at least one address
locking /source/exim4/AutoTest/spool/db/wait-smtp.lockfile
locked /source/exim4/AutoTest/spool/db/wait-smtp.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/wait-smtp)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/wait-smtp: flags=2
dbfn_read: key=10.0.0.0
dbfn_write: key=10.0.0.0
@@ -158,6 +166,8 @@
x@y
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/retry: flags=2
address match: subject=x@y pattern=*
y in "*"? yes (matched "*")
@@ -253,6 +263,8 @@
set_process_info: 21680 delivering 10HmaY-0005vi-00
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ph10@???

  Index: 463
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/463,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 463    6 Apr 2005 10:06:14 -0000    1.2
  +++ 463    22 Jun 2005 14:45:06 -0000    1.3
  @@ -118,6 +118,8 @@
   Attempting full verification using callout
   locking /source/exim4/AutoTest/spool/db/callout.lockfile
   locked /source/exim4/AutoTest/spool/db/callout.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/callout)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/callout: flags=2
   dbfn_read: key=remote
   callout cache: found domain record
  @@ -143,6 +145,8 @@
     SMTP>> QUIT
   locking /source/exim4/AutoTest/spool/db/callout.lockfile
   locked /source/exim4/AutoTest/spool/db/callout.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/callout)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/callout: flags=42
   dbfn_write: key=remote
   wrote callout cache domain record:
  @@ -217,6 +221,8 @@
   Attempting full verification using callout
   locking /source/exim4/AutoTest/spool/db/callout.lockfile
   locked /source/exim4/AutoTest/spool/db/callout.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/callout)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/callout: flags=2
   dbfn_read: key=remote
   callout cache: found domain record


  Index: 466
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/466,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 466    6 Apr 2005 10:06:14 -0000    1.3
  +++ 466    22 Jun 2005 14:45:06 -0000    1.4
  @@ -67,6 +67,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
  @@ -101,6 +103,8 @@
     transport: <none>
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: /source/exim4/AutoTest/test-mail
@@ -118,6 +122,8 @@
--------> /source/exim4/AutoTest/test-mail <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to /source/exim4/AutoTest/test-mail </source/exim4/AutoTest/test-mail> transport=t1

  Index: 468
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/468,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 468    6 Apr 2005 10:06:14 -0000    1.4
  +++ 468    22 Jun 2005 14:45:06 -0000    1.5
  @@ -131,6 +131,8 @@
     rd+mug99@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
  @@ -319,6 +321,8 @@
     transport: t1
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   Considering: /source/exim4/AutoTest/test-mail/junk
  @@ -344,6 +348,8 @@
   --------> /source/exim4/AutoTest/test-mail/junk <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   expanding: /home/$local_part
      result: /home/mug99
  @@ -393,6 +399,8 @@
   --------> /source/exim4/AutoTest/test-mail/junk <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to /source/exim4/AutoTest/test-mail/junk </source/exim4/AutoTest/test-mail/junk> transport=ft1
  @@ -440,6 +448,8 @@
   --------> ph10@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to ph10 <ph10@???> transport=t1
  @@ -464,6 +474,8 @@
   --------> mug99@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   expanding: /home/$local_part
      result: /home/mug99
  @@ -490,6 +502,8 @@
   --------> usr@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   expanding: /$local_part
      result: /usr


  Index: 469
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/469,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 469    6 Apr 2005 10:06:14 -0000    1.3
  +++ 469    22 Jun 2005 14:45:06 -0000    1.4
  @@ -67,6 +67,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
  @@ -128,6 +130,8 @@
     transport: <none>
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: /source/exim4/AutoTest/test-mail/junk
@@ -145,6 +149,8 @@
--------> /source/exim4/AutoTest/test-mail/junk <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to /source/exim4/AutoTest/test-mail/junk </source/exim4/AutoTest/test-mail/junk> transport=t1

  Index: 470
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/470,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 470    3 May 2005 14:20:01 -0000    1.6
  +++ 470    22 Jun 2005 14:45:06 -0000    1.7
  @@ -166,6 +166,8 @@
     mug99@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
  @@ -206,6 +208,8 @@
     transport: <none>
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   Considering: >sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???
  @@ -223,6 +227,8 @@
   --------> >sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to >sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@??? <>sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???> transport=t1
  @@ -918,6 +924,8 @@
     sender@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: sender@???
@@ -15522,6 +15530,8 @@
--------> sender@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to sender <sender@???> transport=t2

  Index: 474
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/474,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 474    6 Apr 2005 10:06:14 -0000    1.3
  +++ 474    22 Jun 2005 14:45:06 -0000    1.4
  @@ -67,6 +67,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -127,6 +129,8 @@
--------> ph10@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1

  Index: 503
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/503,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 503    25 Jan 2005 14:16:34 -0000    1.2
  +++ 503    22 Jun 2005 14:45:06 -0000    1.3
  @@ -91,6 +91,8 @@
   Attempting full verification using callout
   locking /source/exim4/AutoTest/spool/db/callout.lockfile
   locked /source/exim4/AutoTest/spool/db/callout.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/callout)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/callout: flags=2
   dbfn_read: key=y
   callout cache: no domain record found
  @@ -116,6 +118,8 @@
     SMTP>> QUIT
   locking /source/exim4/AutoTest/spool/db/callout.lockfile
   locked /source/exim4/AutoTest/spool/db/callout.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/callout)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/callout: flags=42
   dbfn_write: key=y
   wrote callout cache domain record:
  @@ -197,6 +201,8 @@
   Attempting full verification using callout
   locking /source/exim4/AutoTest/spool/db/callout.lockfile
   locked /source/exim4/AutoTest/spool/db/callout.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/callout)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/callout: flags=2
   dbfn_read: key=y
   callout cache: found domain record


  Index: 517
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/517,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 517    6 Apr 2005 10:06:14 -0000    1.4
  +++ 517    22 Jun 2005 14:45:06 -0000    1.5
  @@ -67,6 +67,8 @@
     nofile@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
  @@ -102,6 +104,8 @@
   --------> nofile@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to nofile <nofile@???> transport=t1
  @@ -236,6 +240,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   Considering: ph10@???
  @@ -270,6 +276,8 @@
   --------> ph10@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to ph10 <ph10@???> transport=t1
  @@ -406,6 +414,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   Considering: ph10@???
  @@ -440,6 +450,8 @@
   --------> ph10@??? <--------
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   no retry data available
   search_tidyup called
   changed uid/gid: local delivery to ph10 <ph10@???> transport=t1
  @@ -496,6 +508,8 @@
   ph10@???
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/retry: flags=2
   address match: subject=ph10@??? pattern=*
   test.ex in "*"? yes (matched "*")
  @@ -584,6 +598,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ph10@???
@@ -620,6 +636,8 @@
--------> ph10@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0
dbfn_read: key=T:ph10@???
retry record exists: age=0 (max=604800)
@@ -668,6 +686,8 @@
ph10@???
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/retry: flags=2
address match: subject=ph10@??? pattern=*
test.ex in "*"? yes (matched "*")

  Index: 536
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/536,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 536    6 Apr 2005 10:06:14 -0000    1.3
  +++ 536    22 Jun 2005 14:45:06 -0000    1.4
  @@ -67,6 +67,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -102,6 +104,8 @@
--------> ph10@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1

  Index: 568
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/568,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 568    6 Apr 2005 10:06:14 -0000    1.3
  +++ 568    22 Jun 2005 14:45:06 -0000    1.4
  @@ -89,6 +89,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   ensuring /source/exim4/AutoTest/spool/db/retry.lockfile is owned by exim
   no retry data available

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -124,6 +126,8 @@
--------> ph10@??? <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
no retry data available
search_tidyup called
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1

  Index: 581
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 581    3 May 2005 14:20:01 -0000    1.6
  +++ 581    22 Jun 2005 14:45:06 -0000    1.7
  @@ -29,6 +29,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   Considering: ph10@???
  @@ -81,6 +83,8 @@
   checking status of 127.0.0.1
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0
   dbfn_read: key=T:127.0.0.1:127.0.0.1:1225
   dbfn_read: key=T:127.0.0.1:127.0.0.1:1225:10HmaX-0005vi-00
  @@ -130,6 +134,8 @@
   all IP addresses skipped or deferred at least one address
   locking /source/exim4/AutoTest/spool/db/wait-t1.lockfile
   locked /source/exim4/AutoTest/spool/db/wait-t1.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/wait-t1)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/wait-t1: flags=2
   Leaving t1 transport
   set_process_info: 21680 delivering 10HmaX-0005vi-00 (just run t1 for ph10@??? in subprocess)
  @@ -156,6 +162,8 @@
   ph10@???
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/retry: flags=2
   address match: subject=*@127.0.0.1 pattern=*
   127.0.0.1 in "*"? yes (matched "*")
  @@ -255,6 +263,8 @@
     ph10@??? 
   locking /source/exim4/AutoTest/spool/db/retry.lockfile
   locked /source/exim4/AutoTest/spool/db/retry.lockfile
  +EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
  +returned from EXIM_DBOPEN
   opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ph10@???
@@ -307,6 +317,8 @@
checking status of 127.0.0.1
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/retry: flags=0
dbfn_read: key=T:127.0.0.1:127.0.0.1:1225
dbfn_read: key=T:127.0.0.1:127.0.0.1:1225:10HmaY-0005vi-00
@@ -335,6 +347,8 @@
all IP addresses skipped or deferred at least one address
locking /source/exim4/AutoTest/spool/db/wait-t1.lockfile
locked /source/exim4/AutoTest/spool/db/wait-t1.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/wait-t1)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/wait-t1: flags=2
dbfn_read: key=127.0.0.1
dbfn_write: key=127.0.0.1
@@ -363,6 +377,8 @@
ph10@???
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
+EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
+returned from EXIM_DBOPEN
opened hints database /source/exim4/AutoTest/spool/db/retry: flags=2
address match: subject=*@127.0.0.1 pattern=*
127.0.0.1 in "*"? yes (matched "*")