X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fdbif.c;h=d7f19bd9a933f6512c2040d1cd55e84087f732e5;hb=7bd0ab8692a994665b52d5680359e64866526fc1;hp=36131442945e78ed248b2c1375e14d006c0d829b;hpb=9753ac7c67d4871ea344993538b08c3850ad12e7;p=netatalk.git

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 36131442..d7f19bd9 100644
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbif.c,v 1.7 2009-04-28 13:01:24 franklahm Exp $
+ * $Id: dbif.c,v 1.19 2009-12-21 06:41:09 franklahm Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * Copyright (C) Frank Lahm 2009
@@ -29,49 +29,10 @@
 
 #define DB_ERRLOGFILE "db_errlog"
 
-static DB_ENV *db_env = NULL;
-static DB_TXN *db_txn = NULL;
-static FILE   *db_errlog = NULL;
-
-static struct db_table {
-    char            *name;
-    DB              *db;
-    u_int32_t       general_flags;
-    DBTYPE          type;
-} db_table[] =
-{
-    { "cnid2.db",       NULL,      0, DB_BTREE},
-    { "devino.db",      NULL,      0, DB_BTREE},
-    { "didname.db",     NULL,      0, DB_BTREE},
-};
-
 static char *old_dbfiles[] = {"cnid.db", NULL};
 
 /* --------------- */
-static int  db_compat_associate (DB *p, DB *s,
-                                 int (*callback)(DB *, const DBT *,const DBT *, DBT *),
-                                 u_int32_t flags)
-{
-    return p->associate(p, NULL, s, callback, flags);
-}
-
-/* --------------- */
-static int db_compat_open(DB *db, char *file, char *name, DBTYPE type, int mode)
-{
-    int ret;
-
-    ret = db->open(db, NULL, file, name, type, DB_CREATE, mode);
-
-    if (ret) {
-        LOG(log_error, logtype_cnid, "error opening database %s: %s", name, db_strerror(ret));
-        return -1;
-    } else {
-        return 0;
-    }
-}
-
-/* --------------- */
-static int upgrade_required()
+static int upgrade_required(void)
 {
     int i;
     int found = 0;
@@ -91,142 +52,241 @@ static int upgrade_required()
 }
 
 /* --------------- */
-int dbif_stamp(void *buffer, int size)
+int dbif_stamp(DBD *dbd, void *buffer, int size)
 {
     struct stat st;
-    int         rc;
+    int         rc,cwd;
 
     if (size < 8)
         return -1;
 
-    if ((rc = stat(db_table[0].name, &st)) < 0) {
-        LOG(log_error, logtype_cnid, "error stating database %s: %s", db_table[0].name, db_strerror(rc));
+    /* Remember cwd */
+    if ((cwd = open(".", O_RDONLY)) < 0) {
+        LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+        return -1;
+    }
+
+    /* chdir to db_envhome */
+    if ((chdir(dbd->db_envhome)) != 0) {
+        LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));        
+        return -1;
+    }
+
+    if ((rc = stat(dbd->db_table[DBIF_CNID].name, &st)) < 0) {
+        LOG(log_error, logtype_cnid, "error stating database %s: %s", dbd->db_table[DBIF_CNID].name, db_strerror(rc));
         return -1;
     }
     memset(buffer, 0, size);
     memcpy(buffer, &st.st_ctime, sizeof(st.st_ctime));
 
+    if ((fchdir(cwd)) != 0) {
+        LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));        
+        return -1;
+    }
+
     return 0;
 }
 
 /* --------------- */
-/*
- *  We assume our current directory is already the BDB homedir. Otherwise
- *  opening the databases will not work as expected.
- */
-int dbif_env_init(struct db_param *dbp, uint32_t dbenv_oflags)
+DBD *dbif_init(const char *envhome, const char *filename)
 {
-    int ret;
+    DBD *dbd;
+
+    if ( NULL == (dbd = calloc(sizeof(DBD), 1)) )
+        return NULL;
+
+    /* filename == NULL means in memory db */
+    if (filename) {
+        if (! envhome)
+            return NULL;
+
+        dbd->db_envhome = strdup(envhome);
+        if (NULL == dbd->db_envhome) {
+            free(dbd);
+            return NULL;
+        }
+
+        dbd->db_filename = strdup(filename);
+        if (NULL == dbd->db_filename) {
+            free(dbd->db_envhome);
+            free(dbd);
+            return NULL;
+        }
+    }
+    
+    dbd->db_table[DBIF_CNID].name        = "cnid2.db";
+    dbd->db_table[DBIF_IDX_DEVINO].name  = "devino.db";
+    dbd->db_table[DBIF_IDX_DIDNAME].name = "didname.db";
+
+    dbd->db_table[DBIF_CNID].type        = DB_BTREE;
+    dbd->db_table[DBIF_IDX_DEVINO].type  = DB_BTREE;
+    dbd->db_table[DBIF_IDX_DIDNAME].type = DB_BTREE;
+
+    dbd->db_table[DBIF_CNID].openflags        = DB_CREATE;
+    dbd->db_table[DBIF_IDX_DEVINO].openflags  = DB_CREATE;
+    dbd->db_table[DBIF_IDX_DIDNAME].openflags = DB_CREATE;
+
+    return dbd;
+}
+
+/* 
+   We must open the db_env with an absolute pathname, as `dbd` keeps chdir'ing, which
+   breaks e.g. bdb logfile-rotation with relative pathnames.
+   But still we use relative paths with upgrade_required() and the DB_ERRLOGFILE
+   in order to avoid creating absolute paths by copying. Both have no problem with
+   a relative path.
+*/
+int dbif_env_open(DBD *dbd, struct db_param *dbp, uint32_t dbenv_oflags)
+{
+    int ret, cwd;
     char **logfiles = NULL;
     char **file;
 
+    /* Remember cwd */
+    if ((cwd = open(".", O_RDONLY)) < 0) {
+        LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+        return -1;
+    }
+
+    /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file  */
+    if ((chdir(dbd->db_envhome)) != 0) {
+        LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));        
+        return -1;
+    }
+
     /* Refuse to do anything if this is an old version of the CNID database */
     if (upgrade_required()) {
         LOG(log_error, logtype_cnid, "Found version 1 of the CNID database. Please upgrade to version 2");
         return -1;
     }
 
-    if ((db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
+    if ((dbd->db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
         LOG(log_warning, logtype_cnid, "error creating/opening DB errlogfile: %s", strerror(errno));
 
-    if ((ret = db_env_create(&db_env, 0))) {
+    if ((fchdir(cwd)) != 0) {
+        LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));        
+        return -1;
+    }
+
+    if ((ret = db_env_create(&dbd->db_env, 0))) {
         LOG(log_error, logtype_cnid, "error creating DB environment: %s",
             db_strerror(ret));
-        db_env = NULL;
+        dbd->db_env = NULL;
         return -1;
     }
 
-    if (db_errlog != NULL) {
-        db_env->set_errfile(db_env, db_errlog);
-        db_env->set_msgfile(db_env, db_errlog);
+    if (dbd->db_errlog != NULL) {
+        dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
+        dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
     }
 
-    db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
-
-    /* Open the database for recovery using DB_PRIVATE option which is faster */
-    if ((ret = db_env->open(db_env, ".", dbenv_oflags | DB_PRIVATE | DB_RECOVER, 0))) {
-        LOG(log_error, logtype_cnid, "error opening DB environment: %s",
-            db_strerror(ret));
-        db_env->close(db_env, 0);
-        db_env = NULL;
-        return -1;
-    }
+    if (dbenv_oflags & DB_RECOVER) {
+        dbd->db_env->set_verbose(dbd->db_env, DB_VERB_RECOVERY, 1);
+        /* Open the database for recovery using DB_PRIVATE option which is faster */
+        if ((ret = dbd->db_env->open(dbd->db_env, dbd->db_envhome, dbenv_oflags | DB_PRIVATE, 0))) {
+            LOG(log_error, logtype_cnid, "error opening DB environment: %s",
+                db_strerror(ret));
+            dbd->db_env->close(dbd->db_env, 0);
+            dbd->db_env = NULL;
+            return -1;
+        }
+        dbenv_oflags = (dbenv_oflags & ~DB_RECOVER);
 
-    if (db_errlog != NULL)
-        fflush(db_errlog);
+        if (dbd->db_errlog != NULL)
+            fflush(dbd->db_errlog);
 
-    if ((ret = db_env->close(db_env, 0))) {
-        LOG(log_error, logtype_cnid, "error closing DB environment after recovery: %s",
-            db_strerror(ret));
-        db_env = NULL;
-        return -1;
-    }
+        if ((ret = dbd->db_env->close(dbd->db_env, 0))) {
+            LOG(log_error, logtype_cnid, "error closing DB environment after recovery: %s",
+                db_strerror(ret));
+            dbd->db_env = NULL;
+            return -1;
+        }
 
-    if ((ret = db_env_create(&db_env, 0))) {
-        LOG(log_error, logtype_cnid, "error creating DB environment after recovery: %s",
-            db_strerror(ret));
-        db_env = NULL;
-        return -1;
+        if ((ret = db_env_create(&dbd->db_env, 0))) {
+            LOG(log_error, logtype_cnid, "error creating DB environment after recovery: %s",
+                db_strerror(ret));
+            dbd->db_env = NULL;
+            return -1;
+        }
     }
 
-    if ((ret = db_env->set_cachesize(db_env, 0, 1024 * dbp->cachesize, 0))) {
+    if ((ret = dbd->db_env->set_cachesize(dbd->db_env, 0, 1024 * dbp->cachesize, 0))) {
         LOG(log_error, logtype_cnid, "error setting DB environment cachesize to %i: %s",
             dbp->cachesize, db_strerror(ret));
-        db_env->close(db_env, 0);
-        db_env = NULL;
+        dbd->db_env->close(dbd->db_env, 0);
+        dbd->db_env = NULL;
         return -1;
     }
 
-    if (db_errlog != NULL) {
-        db_env->set_errfile(db_env, db_errlog);
-        db_env->set_msgfile(db_env, db_errlog);
+    if (dbd->db_errlog != NULL) {
+        dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
+        dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
     }
-    if ((ret = db_env->open(db_env, ".", dbenv_oflags, 0))) {
+    if ((ret = dbd->db_env->open(dbd->db_env, dbd->db_envhome, dbenv_oflags, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
             db_strerror(ret));
-        db_env->close(db_env, 0);
-        db_env = NULL;
+        dbd->db_env->close(dbd->db_env, 0);
+        dbd->db_env = NULL;
         return -1;
     }
 
-    if ((ret = db_env->set_flags(db_env, DB_AUTO_COMMIT, 1))) {
+    if ((ret = dbd->db_env->set_flags(dbd->db_env, DB_AUTO_COMMIT, 1))) {
         LOG(log_error, logtype_cnid, "error setting DB_AUTO_COMMIT flag: %s",
             db_strerror(ret));
-        db_env->close(db_env, 0);
-        db_env = NULL;
+        dbd->db_env->close(dbd->db_env, 0);
+        dbd->db_env = NULL;
         return -1;
     }
 
     if (dbp->logfile_autoremove) {
-        if (db_env->log_archive(db_env, &logfiles, 0)) {
+        if (dbd->db_env->log_archive(dbd->db_env, &logfiles, 0)) {
             LOG(log_error, logtype_cnid, "error getting list of stale logfiles: %s",
                 db_strerror(ret));
-            db_env->close(db_env, 0);
-            db_env = NULL;
+            dbd->db_env->close(dbd->db_env, 0);
+            dbd->db_env = NULL;
             return -1;
         }
         if (logfiles != NULL) {
+            /* Remember cwd */
+            if ((cwd = open(".", O_RDONLY)) < 0) {
+                LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+                goto logfiles_done;
+            }
+            /* chdir to db_envhome */
+            if ((chdir(dbd->db_envhome)) != 0) {
+                LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));        
+                goto logfiles_done;
+            }
+
             for (file = logfiles; *file != NULL; file++) {
                 if (unlink(*file) < 0)
                     LOG(log_warning, logtype_cnid, "Error removing stale logfile %s: %s", *file, strerror(errno));
             }
+
+            /* chdir back */
+            if ((fchdir(cwd)) != 0) {
+                LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));        
+                return -1;
+            }
+
+        logfiles_done:
             free(logfiles);
         }
 
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7)
-        if ((ret = db_env->log_set_config(db_env, DB_LOG_AUTO_REMOVE, 1))) {
+        if ((ret = dbd->db_env->log_set_config(dbd->db_env, DB_LOG_AUTO_REMOVE, 1))) {
             LOG(log_error, logtype_cnid, "error setting DB_LOG_AUTO_REMOVE flag: %s",
             db_strerror(ret));
-            db_env->close(db_env, 0);
-            db_env = NULL;
+            dbd->db_env->close(dbd->db_env, 0);
+            dbd->db_env = NULL;
             return -1;
         }
 #else
-        if ((ret = db_env->set_flags(db_env, DB_LOG_AUTOREMOVE, 1))) {
+        if ((ret = dbd->db_env->set_flags(dbd->db_env, DB_LOG_AUTOREMOVE, 1))) {
             LOG(log_error, logtype_cnid, "error setting DB_LOG_AUTOREMOVE flag: %s",
                 db_strerror(ret));
-            db_env->close(db_env, 0);
-            db_env = NULL;
+            dbd->db_env->close(dbd->db_env, 0);
+            dbd->db_env = NULL;
             return -1;
         }
 #endif
@@ -236,37 +296,101 @@ int dbif_env_init(struct db_param *dbp, uint32_t dbenv_oflags)
 }
 
 /* --------------- */
-int dbif_open(struct db_param *dbp _U_, int do_truncate)
+int dbif_open(DBD *dbd, struct db_param *dbp, int reindex)
 {
-    int ret;
-    int i;
+    int ret, i, cwd;
     u_int32_t count;
+    struct stat st;
+    DB *upgrade_db;
+
+    /* Try to upgrade if it's a normal on-disk database */
+    if (dbd->db_envhome) {
+        /* Remember cwd */
+        if ((cwd = open(".", O_RDONLY)) < 0) {
+            LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+            return -1;
+        }
+        
+        /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file  */
+        if ((chdir(dbd->db_envhome)) != 0) {
+            LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));        
+            return -1;
+        }
+        
+        if ((stat(dbd->db_filename, &st)) == 0) {
+            LOG(log_debug, logtype_cnid, "See if we can upgrade the CNID database...");
+            if ((ret = db_create(&upgrade_db, dbd->db_env, 0))) {
+                LOG(log_error, logtype_cnid, "error creating handle for database: %s", db_strerror(ret));
+                return -1;
+            }
+            if ((ret = upgrade_db->upgrade(upgrade_db, dbd->db_filename, 0))) {
+                LOG(log_error, logtype_cnid, "error upgarding database: %s", db_strerror(ret));
+                return -1;
+            }
+            if ((ret = upgrade_db->close(upgrade_db, 0))) {
+                LOG(log_error, logtype_cnid, "error closing database: %s", db_strerror(ret));
+                return -1;
+            }
+            if ((ret = dbd->db_env->txn_checkpoint(dbd->db_env, 0, 0, DB_FORCE))) {
+                LOG(log_error, logtype_cnid, "error forcing checkpoint: %s", db_strerror(ret));
+                return -1;
+            }
+            LOG(log_debug, logtype_cnid, "Finished CNID database upgrade check");
+        }
+        
+        if ((fchdir(cwd)) != 0) {
+            LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));        
+            return -1;
+        }
+    }
 
+    /* Now open databases ... */
     for (i = 0; i != DBIF_DB_CNT; i++) {
-        if ((ret = db_create(&(db_table[i].db), db_env, 0))) {
+        if ((ret = db_create(&dbd->db_table[i].db, dbd->db_env, 0))) {
             LOG(log_error, logtype_cnid, "error creating handle for database %s: %s",
-                db_table[i].name, db_strerror(ret));
+                dbd->db_table[i].name, db_strerror(ret));
             return -1;
         }
 
-        if (db_table[i].general_flags) {
-            if ((ret = db_table[i].db->set_flags(db_table[i].db, db_table[i].general_flags))) {
+        if (dbd->db_table[i].flags) {
+            if ((ret = dbd->db_table[i].db->set_flags(dbd->db_table[i].db,
+                                                      dbd->db_table[i].flags))) {
                 LOG(log_error, logtype_cnid, "error setting flags for database %s: %s",
-                    db_table[i].name, db_strerror(ret));
+                    dbd->db_table[i].name, db_strerror(ret));
+                return -1;
+            }
+        }
+
+        if ( ! dbd->db_env) {   /* In memory db */
+            if ((ret = dbd->db_table[i].db->set_cachesize(dbd->db_table[i].db,
+                                                          0,
+                                                          dbp->cachesize,
+                                                          4)) /* split in 4 memory chunks */
+                < 0)  {
+                LOG(log_error, logtype_cnid, "error setting cachesize %u KB for database %s: %s",
+                    dbp->cachesize / 1024, dbd->db_table[i].name, db_strerror(ret));
                 return -1;
             }
         }
 
-        if (db_compat_open(db_table[i].db, db_table[0].name, db_table[i].name, db_table[i].type, 0664) < 0)
+        if (dbd->db_table[i].db->open(dbd->db_table[i].db,
+                                      dbd->db_txn,
+                                      dbd->db_filename,
+                                      dbd->db_table[i].name,
+                                      dbd->db_table[i].type,
+                                      dbd->db_table[i].openflags,
+                                      0664) < 0) {
+            LOG(log_error, logtype_cnid, "Cant open database");
             return -1;
-        if (db_errlog != NULL)
-            db_table[i].db->set_errfile(db_table[i].db, db_errlog);
+        }
+        if (dbd->db_errlog != NULL)
+            dbd->db_table[i].db->set_errfile(dbd->db_table[i].db, dbd->db_errlog);
 
-        if (do_truncate && i > 0) {
+        if (reindex && i > 0) {
             LOG(log_info, logtype_cnid, "Truncating CNID index.");
-            if ((ret = db_table[i].db->truncate(db_table[i].db, NULL, &count, 0))) {
+            if ((ret = dbd->db_table[i].db->truncate(dbd->db_table[i].db, NULL, &count, 0))) {
                 LOG(log_error, logtype_cnid, "error truncating database %s: %s",
-                    db_table[i].name, db_strerror(ret));
+                    dbd->db_table[i].name, db_strerror(ret));
                 return -1;
             }
         }
@@ -275,33 +399,47 @@ int dbif_open(struct db_param *dbp _U_, int do_truncate)
     /* TODO: Implement CNID DB versioning info on new databases. */
 
     /* Associate the secondary with the primary. */
-    LOG(log_debug, logtype_cnid, "Associating DBIF_IDX_DIDNAME index. Possibly reindexing...");
-    if ((ret = db_compat_associate(db_table[0].db, db_table[DBIF_IDX_DIDNAME].db, didname, (do_truncate)?DB_CREATE:0)) != 0) {
+    if (reindex)
+        LOG(log_info, logtype_cnid, "Reindexing did/name index...");
+    if ((ret = dbd->db_table[0].db->associate(dbd->db_table[DBIF_CNID].db,
+                                              dbd->db_txn,
+                                              dbd->db_table[DBIF_IDX_DIDNAME].db, 
+                                              didname,
+                                              (reindex) ? DB_CREATE : 0))
+         != 0) {
         LOG(log_error, logtype_cnid, "Failed to associate didname database: %s",db_strerror(ret));
         return -1;
     }
-    LOG(log_debug, logtype_cnid, "... done.");
-
-    LOG(log_debug, logtype_cnid, "Associating DBIF_IDX_DEVINO index. Possibly reindexing...");
-    if ((ret = db_compat_associate(db_table[0].db, db_table[DBIF_IDX_DEVINO].db, devino, (do_truncate)?DB_CREATE:0)) != 0) {
+    if (reindex)
+        LOG(log_info, logtype_cnid, "... done.");
+
+    if (reindex)
+        LOG(log_info, logtype_cnid, "Reindexing dev/ino index...");
+    if ((ret = dbd->db_table[0].db->associate(dbd->db_table[0].db, 
+                                              dbd->db_txn,
+                                              dbd->db_table[DBIF_IDX_DEVINO].db, 
+                                              devino,
+                                              (reindex) ? DB_CREATE : 0))
+        != 0) {
         LOG(log_error, logtype_cnid, "Failed to associate devino database: %s",db_strerror(ret));
         return -1;
     }
-    LOG(log_debug, logtype_cnid, "... done.");
-
+    if (reindex)
+        LOG(log_info, logtype_cnid, "... done.");
+    
     return 0;
 }
 
 /* ------------------------ */
-int dbif_closedb()
+static int dbif_closedb(DBD *dbd)
 {
     int i;
     int ret;
     int err = 0;
 
     for (i = DBIF_DB_CNT -1; i >= 0; i--) {
-        if (db_table[i].db != NULL && (ret = db_table[i].db->close(db_table[i].db, 0))) {
-            LOG(log_error, logtype_cnid, "error closing database %s: %s", db_table[i].name, db_strerror(ret));
+        if (dbd->db_table[i].db != NULL && (ret = dbd->db_table[i].db->close(dbd->db_table[i].db, 0))) {
+            LOG(log_error, logtype_cnid, "error closing database %s: %s", dbd->db_table[i].name, db_strerror(ret));
             err++;
         }
     }
@@ -311,27 +449,125 @@ int dbif_closedb()
 }
 
 /* ------------------------ */
-int dbif_close()
+int dbif_close(DBD *dbd)
 {
     int ret;
     int err = 0;
 
-    if (dbif_closedb())
+    if (dbif_closedb(dbd))
         err++;
 
-    if (db_env != NULL && (ret = db_env->close(db_env, 0))) {
+    if (dbd->db_env != NULL && (ret = dbd->db_env->close(dbd->db_env, 0))) {
         LOG(log_error, logtype_cnid, "error closing DB environment: %s", db_strerror(ret));
         err++;
     }
-    if (db_errlog != NULL && fclose(db_errlog) == EOF) {
+    if (dbd->db_errlog != NULL && fclose(dbd->db_errlog) == EOF) {
         LOG(log_error, logtype_cnid, "error closing DB logfile: %s", strerror(errno));
         err++;
     }
+
+    free(dbd->db_filename);
+    free(dbd);
+    dbd = NULL;
+
     if (err)
         return -1;
     return 0;
 }
 
+/* 
+   In order to support silent database upgrades:
+   destroy env at cnid_dbd shutdown.
+ */
+int dbif_prep_upgrade(const char *path)
+{
+    int cwd, ret;
+    DBD *dbd;
+
+    LOG(log_debug, logtype_cnid, "Reopening BerkeleyDB environment");
+    
+    if (NULL == (dbd = dbif_init(path, "cnid2.db")))
+        return -1;
+
+    /* Remember cwd */
+    if ((cwd = open(".", O_RDONLY)) < 0) {
+        LOG(log_error, logtype_cnid, "error opening cwd: %s", strerror(errno));
+        return -1;
+    }
+
+    /* chdir to db_envhome. makes it easier checking for old db files and creating db_errlog file  */
+    if ((chdir(dbd->db_envhome)) != 0) {
+        LOG(log_error, logtype_cnid, "error chdiring to db_env '%s': %s", dbd->db_envhome, strerror(errno));        
+        return -1;
+    }
+
+    if ((dbd->db_errlog = fopen(DB_ERRLOGFILE, "a")) == NULL)
+        LOG(log_warning, logtype_cnid, "error creating/opening DB errlogfile: %s", strerror(errno));
+    
+    if ((fchdir(cwd)) != 0) {
+        LOG(log_error, logtype_cnid, "error chdiring back: %s", strerror(errno));        
+        return -1;
+    }
+
+    /* Get db_env handle */
+    if ((ret = db_env_create(&dbd->db_env, 0))) {
+        LOG(log_error, logtype_cnid, "error creating DB environment: %s", db_strerror(ret));
+        dbd->db_env = NULL;
+        return -1;
+    }
+
+    /* Set logfile */
+    if (dbd->db_errlog != NULL) {
+        dbd->db_env->set_errfile(dbd->db_env, dbd->db_errlog);
+        dbd->db_env->set_msgfile(dbd->db_env, dbd->db_errlog);
+        dbd->db_env->set_verbose(dbd->db_env, DB_VERB_RECOVERY, 1);
+    }
+
+    /* Open environment with recovery */
+    if ((ret = dbd->db_env->open(dbd->db_env, 
+                                 dbd->db_envhome,
+                                 DB_CREATE | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | DB_RECOVER | DB_PRIVATE,
+                                 0))) {
+        LOG(log_error, logtype_cnid, "error opening DB environment: %s",
+            db_strerror(ret));
+        dbd->db_env->close(dbd->db_env, 0);
+        dbd->db_env = NULL;
+        return -1;
+    }
+
+    if (dbd->db_errlog != NULL)
+        fflush(dbd->db_errlog);
+
+    /* Remove logfiles */
+    if ((ret = dbd->db_env->log_archive(dbd->db_env, NULL, DB_ARCH_REMOVE))) {
+         LOG(log_error, logtype_cnid, "error removing transaction logfiles: %s", db_strerror(ret));
+         return -1;
+    }
+
+    if ((ret = dbd->db_env->close(dbd->db_env, 0))) {
+        LOG(log_error, logtype_cnid, "error closing DB environment after recovery: %s", db_strerror(ret));
+        dbd->db_env = NULL;
+        return -1;
+    }
+
+    LOG(log_debug, logtype_cnid, "BerkeleyDB environment recovery done.");
+
+    /* Get a new db_env handle and then remove environment */
+    if ((ret = db_env_create(&dbd->db_env, 0))) {
+        LOG(log_error, logtype_cnid, "error acquiring db_end handle: %s", db_strerror(ret));
+        dbd->db_env = NULL;
+        return -1;
+    }
+    if ((ret = dbd->db_env->remove(dbd->db_env, dbd->db_envhome, 0))) {
+        LOG(log_error, logtype_cnid, "error removing BerkeleyDB environment: %s", db_strerror(ret));
+        return -1;
+    }
+
+    LOG(log_debug, logtype_cnid, "Removed BerkeleyDB environment.");
+
+    return 0;
+}
+
 /*
  *  The following three functions are wrappers for DB->get(), DB->put() and DB->del().
  *  All three return -1 on error. dbif_get()/dbif_del return 1 if the key was found and 0
@@ -342,94 +578,122 @@ int dbif_close()
  *  functions are not expected and therefore error conditions.
  */
 
-int dbif_get(const int dbi, DBT *key, DBT *val, u_int32_t flags)
+int dbif_get(DBD *dbd, const int dbi, DBT *key, DBT *val, u_int32_t flags)
 {
     int ret;
-    DB *db = db_table[dbi].db;
 
-    ret = db->get(db, db_txn, key, val, flags);
+    ret = dbd->db_table[dbi].db->get(dbd->db_table[dbi].db,
+                                     dbd->db_txn,
+                                     key,
+                                     val,
+                                     flags);
 
     if (ret == DB_NOTFOUND)
         return 0;
     if (ret) {
-        LOG(log_error, logtype_cnid, "error retrieving value from %s: %s", db_table[dbi].name, db_strerror(errno));
+        LOG(log_error, logtype_cnid, "error retrieving value from %s: %s",
+            dbd->db_table[dbi].name, db_strerror(errno));
         return -1;
     } else
         return 1;
 }
 
 /* search by secondary return primary */
-int dbif_pget(const int dbi, DBT *key, DBT *pkey, DBT *val, u_int32_t flags)
+int dbif_pget(DBD *dbd, const int dbi, DBT *key, DBT *pkey, DBT *val, u_int32_t flags)
 {
     int ret;
-    DB *db = db_table[dbi].db;
 
-    ret = db->pget(db, db_txn, key, pkey, val, flags);
+    ret = dbd->db_table[dbi].db->pget(dbd->db_table[dbi].db,
+                                      dbd->db_txn,
+                                      key,
+                                      pkey,
+                                      val,
+                                      flags);
 
     if (ret == DB_NOTFOUND || ret == DB_SECONDARY_BAD) {
         return 0;
     }
     if (ret) {
-        LOG(log_error, logtype_cnid, "error retrieving value from %s: %s", db_table[dbi].name, db_strerror(errno));
+        LOG(log_error, logtype_cnid, "error retrieving value from %s: %s",
+            dbd->db_table[dbi].name, db_strerror(errno));
         return -1;
    } else
         return 1;
 }
 
 /* -------------------------- */
-int dbif_put(const int dbi, DBT *key, DBT *val, u_int32_t flags)
+int dbif_put(DBD *dbd, const int dbi, DBT *key, DBT *val, u_int32_t flags)
 {
     int ret;
-    DB *db = db_table[dbi].db;
 
-    if (dbif_txn_begin() < 0) {
-        LOG(log_error, logtype_cnid, "error setting key/value in %s: %s", db_table[dbi].name, db_strerror(errno));
+    if (dbif_txn_begin(dbd) < 0) {
+        LOG(log_error, logtype_cnid, "error setting key/value in %s: %s",
+            dbd->db_table[dbi].name, db_strerror(errno));
         return -1;
     }
 
-    ret = db->put(db, db_txn, key, val, flags);
-
+    ret = dbd->db_table[dbi].db->put(dbd->db_table[dbi].db,
+                                     dbd->db_txn,
+                                     key,
+                                     val,
+                                     flags);
+    
     if (ret) {
         if ((flags & DB_NOOVERWRITE) && ret == DB_KEYEXIST) {
             return 1;
         } else {
-            LOG(log_error, logtype_cnid, "error setting key/value in %s: %s", db_table[dbi].name, db_strerror(errno));
+            LOG(log_error, logtype_cnid, "error setting key/value in %s: %s",
+                dbd->db_table[dbi].name, db_strerror(errno));
             return -1;
         }
     } else
         return 0;
 }
 
-int dbif_del(const int dbi, DBT *key, u_int32_t flags)
+int dbif_del(DBD *dbd, const int dbi, DBT *key, u_int32_t flags)
 {
     int ret;
-    DB *db = db_table[dbi].db;
 
-    if (dbif_txn_begin() < 0) {
-        LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s", db_table[dbi].name, db_strerror(errno));
+    /* For cooperation with the dbd utility and its usage of a cursor */
+    if (dbd->db_cur) {
+        dbd->db_cur->close(dbd->db_cur);
+        dbd->db_cur = NULL;
+    }    
+
+    if (dbif_txn_begin(dbd) < 0) {
+        LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s", 
+            dbd->db_table[dbi].name, db_strerror(errno));
         return -1;
     }
 
-    ret = db->del(db, db_txn, key, flags);
-
+    ret = dbd->db_table[dbi].db->del(dbd->db_table[dbi].db,
+                                     dbd->db_txn,
+                                     key,
+                                     flags);
+    
     if (ret == DB_NOTFOUND || ret == DB_SECONDARY_BAD)
         return 0;
     if (ret) {
-        LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s", db_table[dbi].name, db_strerror(errno));
+        LOG(log_error, logtype_cnid, "error deleting key/value from %s: %s",
+            dbd->db_table[dbi].name, db_strerror(errno));
         return -1;
     } else
         return 1;
 }
 
-int dbif_txn_begin()
+int dbif_txn_begin(DBD *dbd)
 {
     int ret;
 
-    /* If we already have a acitve txn, just return */
-    if (db_txn)
+    /* If we already have an active txn, just return */
+    if (dbd->db_txn)
+        return 0;
+
+    /* If our DBD has no env, just return (-> in memory db) */
+    if (dbd->db_env == NULL)
         return 0;
 
-    ret = db_env->txn_begin(db_env, NULL, &db_txn, 0);
+    ret = dbd->db_env->txn_begin(dbd->db_env, NULL, &dbd->db_txn, 0);
 
     if (ret) {
         LOG(log_error, logtype_cnid, "error starting transaction: %s", db_strerror(errno));
@@ -438,15 +702,19 @@ int dbif_txn_begin()
         return 0;
 }
 
-int dbif_txn_commit()
+int dbif_txn_commit(DBD *dbd)
 {
     int ret;
 
-    if (!db_txn)
+    if (! dbd->db_txn)
         return 0;
 
-    ret = db_txn->commit(db_txn, 0);
-    db_txn = NULL;
+    /* If our DBD has no env, just return (-> in memory db) */
+    if (dbd->db_env == NULL)
+        return 0;
+
+    ret = dbd->db_txn->commit(dbd->db_txn, 0);
+    dbd->db_txn = NULL;
     
     if (ret) {
         LOG(log_error, logtype_cnid, "error committing transaction: %s", db_strerror(errno));
@@ -455,15 +723,19 @@ int dbif_txn_commit()
         return 1;
 }
 
-int dbif_txn_abort()
+int dbif_txn_abort(DBD *dbd)
 {
     int ret;
 
-    if (!db_txn)
+    if (! dbd->db_txn)
         return 0;
 
-    ret = db_txn->abort(db_txn);
-    db_txn = NULL;
+    /* If our DBD has no env, just return (-> in memory db) */
+    if (dbd->db_env == NULL)
+        return 0;
+
+    ret = dbd->db_txn->abort(dbd->db_txn);
+    dbd->db_txn = NULL;
     
     if (ret) {
         LOG(log_error, logtype_cnid, "error aborting transaction: %s", db_strerror(errno));
@@ -472,10 +744,32 @@ int dbif_txn_abort()
         return 0;
 }
 
-int dbif_txn_checkpoint(u_int32_t kbyte, u_int32_t min, u_int32_t flags)
+/* 
+   ret = 1 -> commit txn
+   ret = 0 -> abort txn -> exit!
+   anything else -> exit!
+*/
+void dbif_txn_close(DBD *dbd, int ret)
+{
+    if (ret == 0) {
+        if (dbif_txn_abort(dbd) < 0) {
+            LOG( log_error, logtype_cnid, "Fatal error aborting transaction. Exiting!");
+            exit(EXIT_FAILURE);
+        }
+    } else if (ret == 1) {
+        ret = dbif_txn_commit(dbd);
+        if (  ret < 0) {
+            LOG( log_error, logtype_cnid, "Fatal error committing transaction. Exiting!");
+            exit(EXIT_FAILURE);
+        }
+    } else
+       exit(EXIT_FAILURE);
+}
+
+int dbif_txn_checkpoint(DBD *dbd, u_int32_t kbyte, u_int32_t min, u_int32_t flags)
 {
     int ret;
-    ret = db_env->txn_checkpoint(db_env, kbyte, min, flags);
+    ret = dbd->db_env->txn_checkpoint(dbd->db_env, kbyte, min, flags);
     if (ret) {
         LOG(log_error, logtype_cnid, "error checkpointing transaction susystem: %s", db_strerror(errno));
         return -1;
@@ -483,11 +777,11 @@ int dbif_txn_checkpoint(u_int32_t kbyte, u_int32_t min, u_int32_t flags)
         return 0;
 }
 
-int dbif_count(const int dbi, u_int32_t *count)
+int dbif_count(DBD *dbd, const int dbi, u_int32_t *count)
 {
     int ret;
     DB_BTREE_STAT *sp;
-    DB *db = db_table[dbi].db;
+    DB *db = dbd->db_table[dbi].db;
 
     ret = db->stat(db, NULL, &sp, 0);
 
@@ -502,17 +796,47 @@ int dbif_count(const int dbi, u_int32_t *count)
     return 0;
 }
 
-int dbif_dump(int dumpindexes)
+int dbif_copy_rootinfokey(DBD *srcdbd, DBD *destdbd)
+{
+    DBT key, data;
+    int rc;
+
+    memset(&key, 0, sizeof(key));
+    memset(&data, 0, sizeof(data));
+
+    key.data = ROOTINFO_KEY;
+    key.size = ROOTINFO_KEYLEN;
+
+    if ((rc = dbif_get(srcdbd, DBIF_CNID, &key, &data, 0)) <= 0) {
+        LOG(log_error, logtype_cnid, "dbif_copy_rootinfokey: Error getting rootinfo record");
+        return -1;
+    }
+
+    memset(&key, 0, sizeof(key));
+    key.data = ROOTINFO_KEY;
+    key.size = ROOTINFO_KEYLEN;
+
+    if ((rc = dbif_put(destdbd, DBIF_CNID, &key, &data, 0))) {
+        LOG(log_error, logtype_cnid, "dbif_copy_rootinfokey: Error writing rootinfo key");
+        return -1;
+    }
+
+    return 0;
+}
+
+int dbif_dump(DBD *dbd, int dumpindexes)
 {
     int rc;
-    uint32_t max = 0, count = 0, cnid, type, did;
+    uint32_t max = 0, count = 0, cnid, type, did, lastid;
     uint64_t dev, ino;
+    time_t stamp;
     DBC *cur;
     DBT key = { 0 }, data = { 0 };
-    DB *db = db_table[DBIF_IDX_CNID].db;
+    DB *db = dbd->db_table[DBIF_CNID].db;
     char *typestring[2] = {"f", "d"};
+    char timebuf[64];
 
-    printf("CNID database:\n");
+    printf("CNID database dump:\n");
 
     rc = db->cursor(db, NULL, &cur, 0);
     if (rc) {
@@ -530,18 +854,23 @@ int dbif_dump(int dumpindexes)
 
         /* Rootinfo node ? */
         if (cnid == 0) {
+            memcpy(&stamp, (char *)data.data + 4, sizeof(time_t));
+            memcpy(&lastid, (char *)data.data + 20, sizeof(cnid_t));
+            lastid = ntohl(lastid);
+            strftime(timebuf, sizeof(timebuf), "%b %d %Y %H:%M:%S", localtime(&stamp));
+            printf("dbd stamp: 0x%08x (%s), next free CNID: %u\n", (unsigned int)stamp, timebuf, lastid + 1);
         } else {
             /* dev */
-            memcpy(&dev, data.data + CNID_DEV_OFS, 8);
+            memcpy(&dev, (char *)data.data + CNID_DEV_OFS, 8);
             dev = ntoh64(dev);
             /* ino */
-            memcpy(&ino, data.data + CNID_INO_OFS, 8);
+            memcpy(&ino, (char *)data.data + CNID_INO_OFS, 8);
             ino = ntoh64(ino);
             /* type */
-            memcpy(&type, data.data + CNID_TYPE_OFS, 4);
+            memcpy(&type, (char *)data.data + CNID_TYPE_OFS, 4);
             type = ntohl(type);
             /* did */
-            memcpy(&did, data.data + CNID_DID_OFS, 4);
+            memcpy(&did, (char *)data.data + CNID_DID_OFS, 4);
             did = ntohl(did);
 
             count++;
@@ -572,7 +901,7 @@ int dbif_dump(int dumpindexes)
         /* DBIF_IDX_DEVINO */
         printf("\ndev/inode index:\n");
         count = 0;
-        db = db_table[DBIF_IDX_DEVINO].db;
+        db = dbd->db_table[DBIF_IDX_DEVINO].db;
         rc = db->cursor(db, NULL, &cur, 0);
         if (rc) {
             LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
@@ -593,7 +922,7 @@ int dbif_dump(int dumpindexes)
                 memcpy(&dev, key.data, CNID_DEV_LEN);
                 dev = ntoh64(dev);
                 /* ino */
-                memcpy(&ino, key.data + CNID_DEV_LEN, CNID_INO_LEN);
+                memcpy(&ino, (char *)key.data + CNID_DEV_LEN, CNID_INO_LEN);
                 ino = ntoh64(ino);
                 
                 printf("id: %10u <== dev: 0x%llx, ino: 0x%016llx\n", 
@@ -617,7 +946,7 @@ int dbif_dump(int dumpindexes)
         /* Now dump DBIF_IDX_DIDNAME */
         printf("\ndid/name index:\n");
         count = 0;
-        db = db_table[DBIF_IDX_DIDNAME].db;
+        db = dbd->db_table[DBIF_IDX_DIDNAME].db;
         rc = db->cursor(db, NULL, &cur, 0);
         if (rc) {
             LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
@@ -659,3 +988,57 @@ int dbif_dump(int dumpindexes)
     return 0;
 }
 
+/* 
+   Iterates over dbd, returning cnids.
+   Uses in-value of cnid to seek to that cnid, then gets next and return that in cnid.
+   If close=1, close cursor.
+   Return -1 on error, 0 on EOD (end-of-database), 1 if returning cnid.
+*/
+int dbif_idwalk(DBD *dbd, cnid_t *cnid, int close)
+{
+    int rc;
+    int flag;
+    cnid_t id;
+
+    static DBT key = { 0 }, data = { 0 };
+    DB *db = dbd->db_table[DBIF_CNID].db;
+
+    if (close && dbd->db_cur) {
+        dbd->db_cur->close(dbd->db_cur);
+        dbd->db_cur = NULL;
+        return 0;
+    }
+
+    /* An dbif_del will have closed our cursor too */
+    if ( ! dbd->db_cur ) {
+        if (db->cursor(db, NULL, &dbd->db_cur, 0) != 0) {
+            LOG(log_error, logtype_cnid, "Couldn't create cursor: %s", db_strerror(errno));
+            return -1;
+        }
+        flag = DB_SET_RANGE;    /* This will seek to next cnid after the one just deleted */
+        id = htonl(*cnid);
+        key.data = &id;
+        key.size = sizeof(cnid_t);
+    } else
+        flag = DB_NEXT;
+
+    if ((rc = dbd->db_cur->get(dbd->db_cur, &key, &data, flag)) == 0) {
+        memcpy(cnid, key.data, sizeof(cnid_t));
+        *cnid = ntohl(*cnid);
+        return 1;
+    }
+
+    if (rc != DB_NOTFOUND) {
+        LOG(log_error, logtype_cnid, "Error iterating over btree: %s", db_strerror(errno));
+        dbd->db_cur->close(dbd->db_cur);
+        dbd->db_cur = NULL;
+        return -1;
+    }
+
+    if (dbd->db_cur) {
+        dbd->db_cur->close(dbd->db_cur);
+        dbd->db_cur = NULL;
+    }    
+
+    return 0;
+}