Simple concurrency lock to prevent multiple citservers running at the same time

[citadel.git] / citadel / database.c

diff --git a/citadel/database.c b/citadel/database.c
index e7e57a6437e38c712443bea4ab76b4e4626a4166..dbfac8dd54ebc1522ea588b2d87c483457183794 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -34,17 +34,15 @@
 #ifdef HAVE_DB_H
 #include <db.h>
 #elif defined(HAVE_DB4_DB_H)
-#include <db4/db.h>
+#include <db5/db.h>
 #else
-#error Neither <db.h> nor <db4/db.h> was found by configure. Install db4-devel.
+#error Neither <db.h> nor <db5/db.h> was found by configure. Install db5-devel.
 #endif
 
-
-#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1
-#error Citadel requires Berkeley DB v4.1 or newer.  Please upgrade.
+#if DB_VERSION_MAJOR < 5
+#error Citadel requires Berkeley DB v5.0 or newer.  Please upgrade.
 #endif
 
-
 #include <libcitadel.h>
 
 #include "ctdl_module.h"
@@ -52,7 +50,6 @@
 #include "citserver.h"
 #include "config.h"
 
-
 static DB *dbp[MAXCDB];                /* One DB handle for each Citadel database */
 static DB_ENV *dbenv;          /* The DB environment (global) */
 
@@ -281,9 +278,7 @@ void open_databases(void)
        dbenv->set_paniccall(dbenv, dbpanic);
        dbenv->set_errcall(dbenv, cdb_verbose_err);
        dbenv->set_errpfx(dbenv, "ctdl");
-#if (DB_VERSION_MAJOR > 4) || ( (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) )
        dbenv->set_msgcall(dbenv, cdb_verbose_log);
-#endif
        dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, 1);
        dbenv->set_verbose(dbenv, DB_VERB_RECOVERY, 1);