2007-08-22 17:24:06 +00:00
|
|
|
--- exim-4.67/src/dbstuff.h~ 2007-04-17 14:06:39.000000000 +0100
|
|
|
|
+++ exim-4.67/src/dbstuff.h 2007-08-22 18:10:52.000000000 +0100
|
|
|
|
@@ -135,7 +135,7 @@ API changed for DB 4.1. */
|
|
|
|
#define EXIM_DBOPEN(name, flags, mode, dbpp) \
|
|
|
|
if (db_create(dbpp, NULL, 0) != 0 || \
|
|
|
|
((*dbpp)->set_errcall(*dbpp, dbfn_bdb_error_callback), \
|
|
|
|
- (*dbpp)->open(*dbpp, NULL, CS name, NULL, \
|
|
|
|
+ ((*dbpp)->open)(*dbpp, NULL, CS name, NULL, \
|
|
|
|
((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
|
|
|
|
((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
|
|
|
|
mode)) != 0) *(dbpp) = NULL
|
|
|
|
@@ -143,7 +143,7 @@ API changed for DB 4.1. */
|
|
|
|
#define EXIM_DBOPEN(name, flags, mode, dbpp) \
|
|
|
|
if (db_create(dbpp, NULL, 0) != 0 || \
|
|
|
|
((*dbpp)->set_errcall(*dbpp, dbfn_bdb_error_callback), \
|
|
|
|
- (*dbpp)->open(*dbpp, CS name, NULL, \
|
|
|
|
+ ((*dbpp)->open)(*dbpp, CS name, NULL, \
|
|
|
|
((flags) == O_RDONLY)? DB_UNKNOWN : DB_HASH, \
|
|
|
|
((flags) == O_RDONLY)? DB_RDONLY : DB_CREATE, \
|
|
|
|
mode)) != 0) *(dbpp) = NULL
|
2007-08-22 17:58:47 +00:00
|
|
|
--- exim-4.67/src/search.c~ 2007-04-17 14:06:40.000000000 +0100
|
|
|
|
+++ exim-4.67/src/search.c 2007-08-22 18:57:33.000000000 +0100
|
|
|
|
@@ -397,7 +397,7 @@ if (lk->type == lookup_absfile && open_f
|
|
|
|
/* If opening is successful, call the file-checking function if there is one,
|
|
|
|
and if all is still well, enter the open database into the tree. */
|
|
|
|
|
|
|
|
-handle = lk->open(filename, &search_error_message);
|
|
|
|
+handle = (lk->open)(filename, &search_error_message);
|
|
|
|
if (handle == NULL)
|
|
|
|
{
|
|
|
|
store_pool = old_pool;
|