Merge 2-1

[netatalk.git] / etc / cnid_dbd / dbif.h

diff --git a/etc/cnid_dbd/dbif.h b/etc/cnid_dbd/dbif.h
index 9c886fb1f9d60e960c099cb0b5c4920ab2af575c..f5d3759fca5affba4013d724e2b32813b70309dd 100644 (file)
--- a/etc/cnid_dbd/dbif.h
+++ b/etc/cnid_dbd/dbif.h
@@ -76,6 +76,7 @@ typedef struct {
 
 typedef struct {
     DB_ENV   *db_env;
+    struct db_param db_param;
     DB_TXN   *db_txn;
     DBC      *db_cur;              /* for dbif_walk */
     char     *db_envhome;
@@ -101,7 +102,7 @@ extern int dbif_copy_rootinfokey(DBD *srcdbd, DBD *destdbd);
 extern int dbif_txn_begin(DBD *);
 extern int dbif_txn_commit(DBD *);
 extern int dbif_txn_abort(DBD *);
-extern void dbif_txn_close(DBD *dbd, int ret); /* Switch between commit+abort */
+extern int dbif_txn_close(DBD *dbd, int ret); /* Switch between commit+abort */
 extern int dbif_txn_checkpoint(DBD *, u_int32_t, u_int32_t, u_int32_t);
 
 extern int dbif_dump(DBD *dbd, int dumpindexes);