Merge 2-1

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

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 20b3518e3367f7d24bc23310172af5c7f7773dd2..646385cbe267d392e955e8261220c49ff80dc933 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -125,6 +125,9 @@ static int dbif_getversion(DBD *dbd, uint32_t *version)
     DBT key, data;
     int ret;
 
+    LOG(log_maxdebug, logtype_cnid, "dbif_getversion: reading version info");
+
+    *version = -1;
     memset(&key, 0, sizeof(key));
     memset(&data, 0, sizeof(data));
     key.data = ROOTINFO_KEY;
@@ -138,9 +141,11 @@ static int dbif_getversion(DBD *dbd, uint32_t *version)
         ret = 1;
         break;
     case 0: /* not found */
+        LOG(log_debug, logtype_cnid, "dbif_getversion: no version info found");
         ret = 0;
         break;
     default:
+        LOG(log_error, logtype_cnid, "dbif_getversion: database error");
         ret = -1;
         break;
     }
@@ -189,16 +194,22 @@ static int dbif_setversion(DBD *dbd, uint32_t version)
 }
 
 /*!
- * Upgrade CNID database versions
+ * Upgrade CNID database versions, initialize rootinfo key as as necessary in dbif_setversion()
  *
  * For now this does nothing, as upgrading from ver. 0 to 1 is done in dbif_open
  */
+#define UNINTIALIZED_DB UINT32_MAX
 static int dbif_upgrade(DBD *dbd)
 {
-    uint32_t version;
+    uint32_t version = CNID_VERSION_UNINTIALIZED_DB;
 
     if (dbif_getversion(dbd, &version) == -1)
         return -1;
+    if (version == CNID_VERSION_UNINTIALIZED_DB) {
+        version = CNID_VERSION;
+        if (dbif_setversion(dbd, CNID_VERSION) != 0)
+            return -1;
+    }
 
     /* 
      * Do upgrade stuff ...
@@ -375,6 +386,8 @@ int dbif_env_open(DBD *dbd, struct db_param *dbp, uint32_t dbenv_oflags)
         return -1;
     }
 
+    dbd->db_param = *dbp;
+
     if ((dbif_openlog(dbd)) != 0)
         return -1;
 
@@ -616,6 +629,10 @@ int dbif_open(DBD *dbd, struct db_param *dbp, int reindex)
     if (reindex)
         LOG(log_info, logtype_cnid, "Reindexing name index...");
 
+    /*
+     * Upgrading from version 0 to 1 requires adding the name index below which
+     * must be done by specifying the DB_CREATE flag
+     */
     uint32_t version = CNID_VERSION;
     if (dbd->db_envhome && !reindex) {
         if (dbif_getversion(dbd, &version) == -1)
@@ -990,25 +1007,30 @@ int dbif_txn_abort(DBD *dbd)
 }
 
 /* 
-   ret = 1 -> commit txn
-   ret = 0 -> abort txn -> exit!
+   ret = 1 -> commit txn if db_param.txn_frequency
+   ret = 0 -> abort txn db_param.txn_frequency -> exit!
    anything else -> exit!
+
+   @returns 0 on success (abort or commit), -1 on error
 */
-void dbif_txn_close(DBD *dbd, int ret)
+int 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);
+            return -1;
         }
     } 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);
+            return -1;
         }
-    } else
-       exit(EXIT_FAILURE);
+    } else {
+        return -1;
+    }
+
+    return 0;
 }
 
 int dbif_txn_checkpoint(DBD *dbd, u_int32_t kbyte, u_int32_t min, u_int32_t flags)