Put debug statements on either side of EXIM_DBOPEN() so as to pin down

crashes while opening hints files.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 8a9179f44e914a96df7d59ff8a8ff9c6722bbcff..da19c704a5eaf49a71decda730903764c83e777d 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.167 2005/06/22 10:17:22 ph10 Exp $
+$Cambridge: 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
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -176,6 +176,11 @@ PH/23 Added daemon_startup_retries and daemon_startup_sleep.
 
 PH/24 Added ${if match_ip condition.
 
 
 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
 -----------------
 
 Exim version 4.51
 -----------------

diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index 928cf00f1c94becf68f07b006dd3da3ef09a75a2..36110f3e9d6b24259e6f060a44cb53d1682d0b17 100644 (file)
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dbfn.c,v 1.3 2005/06/14 10:32:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/dbfn.c,v 1.4 2005/06/22 14:45:05 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -152,10 +152,15 @@ DEBUG(D_hints_lookup) debug_printf("locked %s\n", buffer);
 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
 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);
 
 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));
 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)
   {
 
 if (dbblock->dbptr == NULL && errno == ENOENT && flags == O_RDWR)
   {


@@ -163,6 +168,7 @@ if (dbblock->dbptr == NULL && errno == ENOENT && flags == O_RDWR)
     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_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;
   }
 
 save_errno = errno;