Commit rootinfo key txn and open dbenv with path not just .

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 2b5b91ac0f3bcdd7f397b26193840e9f193bbf2d..20b3518e3367f7d24bc23310172af5c7f7773dd2 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -105,6 +105,10 @@ static int dbif_init_rootinfo(DBD *dbd, int version)
 
     if (dbif_put(dbd, DBIF_CNID, &key, &data, 0) < 0)
         return -1;
+    if (dbif_txn_commit(dbd) != 1) {
+        LOG(log_error, logtype_cnid, "dbif_init_rootinfo: cant commit txn");
+        return -1;
+    }
 
     return 0;
 }
@@ -147,7 +151,7 @@ static int dbif_getversion(DBD *dbd, uint32_t *version)
 /*!
  * Set CNID database version number
  *
- * Initializes rootinfo key as neccessary, as does dbif_getversion
+ * Initializes rootinfo key as neccessary
  * @returns -1 on error, 0 on success
  */
 static int dbif_setversion(DBD *dbd, uint32_t version)

diff --git a/etc/cnid_dbd/main.c b/etc/cnid_dbd/main.c
index ec0793cb9ceb2beebe4c1c350408fe19eb97ee38..da4cd9a4e7085d764590140786580a3e82a3bb9d 100644 (file)
--- a/etc/cnid_dbd/main.c
+++ b/etc/cnid_dbd/main.c
@@ -376,7 +376,7 @@ int main(int argc, char *argv[])
         exit(1);
     LOG(log_maxdebug, logtype_cnid, "Finished parsing db_param config file");
 
-    if (NULL == (dbd = dbif_init(".", "cnid2.db")))
+    if (NULL == (dbd = dbif_init(dbpath, "cnid2.db")))
         exit(2);
 
     if (dbif_env_open(dbd, dbp, DBOPTIONS) < 0)