zlib is now mandatory.
[citadel.git] / citadel / database.c
index 9aa870091d6f1dc4684e20617a9149823cff6305..4eb34cdd7a593fef68419b46bef176a93878d361 100644 (file)
@@ -1,8 +1,16 @@
 /*
- * $Id$
- *
  * This is a data store backend for the Citadel server which uses Berkeley DB.
  *
+ * Copyright (c) 1987-2012 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
  */
 
 /*****************************************************************************
@@ -28,6 +36,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <syslog.h>
+#include <zlib.h>
 
 #ifdef HAVE_DB_H
 #include <db.h>
@@ -61,16 +71,12 @@ static DB *dbp[MAXCDB];             /* One DB handle for each Citadel database */
 static DB_ENV *dbenv;          /* The DB environment (global) */
 
 
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#endif
-
 
 /* Verbose logging callback */
 void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
 {
        if (!IsEmptyStr(msg)) {
-               CtdlLogPrintf(CTDL_DEBUG, "DB: %s\n", msg);
+               syslog(LOG_DEBUG, "DB: %s", msg);
        }
 }
 
@@ -78,7 +84,7 @@ void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
 /* Verbose logging callback */
 void cdb_verbose_err(const DB_ENV *dbenv, const char *errpfx, const char *msg)
 {
-       CtdlLogPrintf(CTDL_ALERT, "BDB: %s\n", msg);
+       syslog(LOG_ALERT, "DB: %s", msg);
 }
 
 
@@ -90,8 +96,7 @@ static void txabort(DB_TXN * tid)
        ret = tid->abort(tid);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_abort: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): txn_abort: %s", db_strerror(ret));
                abort();
        }
 }
@@ -104,8 +109,7 @@ static void txcommit(DB_TXN * tid)
        ret = tid->commit(tid, 0);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_commit: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): txn_commit: %s", db_strerror(ret));
                abort();
        }
 }
@@ -118,15 +122,14 @@ static void txbegin(DB_TXN ** tid)
        ret = dbenv->txn_begin(dbenv, NULL, tid, 0);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: txn_begin: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): txn_begin: %s", db_strerror(ret));
                abort();
        }
 }
 
 static void dbpanic(DB_ENV * env, int errval)
 {
-       CtdlLogPrintf(CTDL_EMERG, "cdb_*: Berkeley DB panic: %d\n", errval);
+       syslog(LOG_EMERG, "bdb(): PANIC: %s", db_strerror(errval));
 }
 
 static void cclose(DBC * cursor)
@@ -134,8 +137,7 @@ static void cclose(DBC * cursor)
        int ret;
 
        if ((ret = cursor->c_close(cursor))) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: c_close: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): c_close: %s", db_strerror(ret));
                abort();
        }
 }
@@ -146,31 +148,20 @@ static void bailIfCursor(DBC ** cursors, const char *msg)
 
        for (i = 0; i < MAXCDB; i++)
                if (cursors[i] != NULL) {
-                       CtdlLogPrintf(CTDL_EMERG,
-                               "cdb_*: cursor still in progress on cdb %02x: %s\n",
-                               i, msg);
+                       syslog(LOG_EMERG, "bdb(): cursor still in progress on cdb %02x: %s", i, msg);
                        abort();
                }
 }
 
-void check_handles(void *arg)
-{
-       if (arg != NULL) {
-               ThreadTSD *tsd = (ThreadTSD *) arg;
-
-               bailIfCursor(tsd->cursors, "in check_handles");
-
-               if (tsd->tid != NULL) {
-                       CtdlLogPrintf(CTDL_EMERG,
-                               "cdb_*: transaction still in progress!");
-                       abort();
-               }
-       }
-}
 
 void cdb_check_handles(void)
 {
-       check_handles(pthread_getspecific(ThreadKey));
+       bailIfCursor(TSD->cursors, "in check_handles");
+
+       if (TSD->tid != NULL) {
+               syslog(LOG_EMERG, "bdb(): transaction still in progress!");
+               abort();
+       }
 }
 
 
@@ -188,14 +179,14 @@ static void cdb_cull_logs(void)
 
        /* Get the list of names. */
        if ((ret = dbenv->log_archive(dbenv, &list, flags)) != 0) {
-               CtdlLogPrintf(CTDL_ERR, "cdb_cull_logs: %s\n", db_strerror(ret));
+               syslog(LOG_ERR, "cdb_cull_logs: %s", db_strerror(ret));
                return;
        }
 
        /* Print the list of names. */
        if (list != NULL) {
                for (file = list; *file != NULL; ++file) {
-                       CtdlLogPrintf(CTDL_DEBUG, "Deleting log: %s\n", *file);
+                       syslog(LOG_DEBUG, "Deleting log: %s", *file);
                        ret = unlink(*file);
                        if (ret != 0) {
                                snprintf(errmsg, sizeof(errmsg),
@@ -206,7 +197,7 @@ static void cdb_cull_logs(void)
                                         " This log file is no longer in use "
                                         "and may be safely deleted.\n",
                                         *file, strerror(errno));
-                               aide_message(errmsg, "Database Warning Message");
+                               CtdlAideMessage(errmsg, "Database Warning Message");
                        }
                }
                free(list);
@@ -219,36 +210,22 @@ static void cdb_cull_logs(void)
 void cmd_cull(char *argbuf) {
        if (CtdlAccessCheck(ac_internal)) return;
        cdb_cull_logs();
-       cprintf("%d Database log file cull completed.\n", CIT_OK);
+       cprintf("%d Database log file cull completed.", CIT_OK);
 }
 
 
 /*
- * Request a checkpoint of the database.
+ * Request a checkpoint of the database.  Called once per minute by the thread manager.
  */
 void cdb_checkpoint(void)
 {
        int ret;
-//     static time_t last_run = 0L;
-
-       /* Only do a checkpoint once per minute. */
-/*
- * Don't need this any more, since the thread that calls us sleeps for 60 seconds between calls
-       if ((time(NULL) - last_run) < 60L) {
-               return;
-       }
-       last_run = time(NULL);
-*/
 
-       CtdlLogPrintf(CTDL_DEBUG, "-- db checkpoint --\n");
-       ret = dbenv->txn_checkpoint(dbenv,
-                                   MAX_CHECKPOINT_KBYTES,
-                                   MAX_CHECKPOINT_MINUTES, 0);
+       syslog(LOG_DEBUG, "-- db checkpoint --");
+       ret = dbenv->txn_checkpoint(dbenv, MAX_CHECKPOINT_KBYTES, MAX_CHECKPOINT_MINUTES, 0);
 
        if (ret != 0) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_checkpoint: txn_checkpoint: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "cdb_checkpoint: txn_checkpoint: %s", db_strerror(ret));
                abort();
        }
 
@@ -270,51 +247,60 @@ void open_databases(void)
 {
        int ret;
        int i;
-       char dbfilename[SIZ];
+       char dbfilename[32];
        u_int32_t flags = 0;
        int dbversion_major, dbversion_minor, dbversion_patch;
        int current_dbversion = 0;
 
-       CtdlLogPrintf(CTDL_DEBUG, "cdb_*: open_databases() starting\n");
-       CtdlLogPrintf(CTDL_DEBUG, "Compiled db: %s\n", DB_VERSION_STRING);
-       CtdlLogPrintf(CTDL_INFO, "  Linked db: %s\n",
+       syslog(LOG_DEBUG, "bdb(): open_databases() starting");
+       syslog(LOG_DEBUG, "Compiled db: %s", DB_VERSION_STRING);
+       syslog(LOG_INFO, "  Linked db: %s",
                db_version(&dbversion_major, &dbversion_minor, &dbversion_patch));
 
        current_dbversion = (dbversion_major * 1000000) + (dbversion_minor * 1000) + dbversion_patch;
 
-       CtdlLogPrintf(CTDL_DEBUG, "Calculated dbversion: %d\n", current_dbversion);
-       CtdlLogPrintf(CTDL_DEBUG, "  Previous dbversion: %d\n", CitControl.MMdbversion);
+       syslog(LOG_DEBUG, "Calculated dbversion: %d", current_dbversion);
+       syslog(LOG_DEBUG, "  Previous dbversion: %d", CitControl.MMdbversion);
 
        if ( (getenv("SUPPRESS_DBVERSION_CHECK") == NULL)
           && (CitControl.MMdbversion > current_dbversion) ) {
-               CtdlLogPrintf(CTDL_EMERG, "You are attempting to run the Citadel server using a version\n"
-                                       "of Berkeley DB that is older than that which last created or\n"
-                                       "updated the database.  Because this would probably cause data\n"
-                                       "corruption or loss, the server is aborting execution now.\n");
+               syslog(LOG_EMERG, "You are attempting to run the Citadel server using a version");
+               syslog(LOG_EMERG, "of Berkeley DB that is older than that which last created or");
+               syslog(LOG_EMERG, "updated the database.  Because this would probably cause data");
+               syslog(LOG_EMERG, "corruption or loss, the server is aborting execution now.");
                exit(CTDLEXIT_DB);
        }
 
        CitControl.MMdbversion = current_dbversion;
        put_control();
 
-#ifdef HAVE_ZLIB
-       CtdlLogPrintf(CTDL_INFO, "Linked zlib: %s\n", zlibVersion());
-#endif
+       syslog(LOG_INFO, "Linked zlib: %s\n", zlibVersion());
 
        /*
         * Silently try to create the database subdirectory.  If it's
         * already there, no problem.
         */
-       mkdir(ctdl_data_dir, 0700);
-       chmod(ctdl_data_dir, 0700);
-       chown(ctdl_data_dir, CTDLUID, (-1));
-
-       CtdlLogPrintf(CTDL_DEBUG, "cdb_*: Setting up DB environment\n");
-       db_env_set_func_yield(sched_yield);
+       if ((mkdir(ctdl_data_dir, 0700) != 0) && (errno != EEXIST)){
+               syslog(LOG_EMERG, 
+                             "unable to create database directory [%s]: %s", 
+                             ctdl_data_dir, strerror(errno));
+       }
+       if (chmod(ctdl_data_dir, 0700) != 0){
+               syslog(LOG_EMERG, 
+                             "unable to set database directory accessrights [%s]: %s", 
+                             ctdl_data_dir, strerror(errno));
+       }
+       if (chown(ctdl_data_dir, CTDLUID, (-1)) != 0){
+               syslog(LOG_EMERG, 
+                             "unable to set the owner for [%s]: %s", 
+                             ctdl_data_dir, strerror(errno));
+       }
+       syslog(LOG_DEBUG, "bdb(): Setting up DB environment\n");
+       /* db_env_set_func_yield((int (*)(u_long,  u_long))sched_yield); */
        ret = db_env_create(&dbenv, 0);
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: db_env_create: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): db_env_create: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "exit code %d\n", ret);
                exit(CTDLEXIT_DB);
        }
        dbenv->set_errpfx(dbenv, "citserver");
@@ -333,50 +319,51 @@ void open_databases(void)
         */
        ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: set_cachesize: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): set_cachesize: %s\n", db_strerror(ret));
                dbenv->close(dbenv, 0);
+               syslog(LOG_EMERG, "exit code %d\n", ret);
                exit(CTDLEXIT_DB);
        }
 
        if ((ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT))) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_*: set_lk_detect: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): set_lk_detect: %s\n", db_strerror(ret));
                dbenv->close(dbenv, 0);
+               syslog(LOG_EMERG, "exit code %d\n", ret);
                exit(CTDLEXIT_DB);
        }
 
        flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_TXN | DB_INIT_LOCK | DB_THREAD | DB_RECOVER;
-       CtdlLogPrintf(CTDL_DEBUG, "dbenv->open(dbenv, %s, %d, 0)\n", ctdl_data_dir, flags);
+       syslog(LOG_DEBUG, "dbenv->open(dbenv, %s, %d, 0)\n", ctdl_data_dir, flags);
        ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
        if (ret == DB_RUNRECOVERY) {
-               CtdlLogPrintf(CTDL_ALERT, "dbenv->open: %s\n", db_strerror(ret));
-               CtdlLogPrintf(CTDL_ALERT, "Attempting recovery...\n");
+               syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret));
+               syslog(LOG_ALERT, "Attempting recovery...\n");
                flags |= DB_RECOVER;
                ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
        }
        if (ret == DB_RUNRECOVERY) {
-               CtdlLogPrintf(CTDL_ALERT, "dbenv->open: %s\n", db_strerror(ret));
-               CtdlLogPrintf(CTDL_ALERT, "Attempting catastrophic recovery...\n");
+               syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret));
+               syslog(LOG_ALERT, "Attempting catastrophic recovery...\n");
                flags &= ~DB_RECOVER;
                flags |= DB_RECOVER_FATAL;
                ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
        }
        if (ret) {
-               CtdlLogPrintf(CTDL_DEBUG, "dbenv->open: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "dbenv->open: %s\n", db_strerror(ret));
                dbenv->close(dbenv, 0);
+               syslog(LOG_EMERG, "exit code %d\n", ret);
                exit(CTDLEXIT_DB);
        }
 
-       CtdlLogPrintf(CTDL_INFO, "Starting up DB\n");
+       syslog(LOG_INFO, "Starting up DB\n");
 
        for (i = 0; i < MAXCDB; ++i) {
 
                /* Create a database handle */
                ret = db_create(&dbp[i], dbenv, 0);
                if (ret) {
-                       CtdlLogPrintf(CTDL_DEBUG, "db_create: %s\n",
-                               db_strerror(ret));
+                       syslog(LOG_EMERG, "db_create: %s\n", db_strerror(ret));
+                       syslog(LOG_EMERG, "exit code %d\n", ret);
                        exit(CTDLEXIT_DB);
                }
 
@@ -392,10 +379,14 @@ void open_databases(void)
                                   NULL,
                                   DB_BTREE,
                                   DB_CREATE | DB_AUTO_COMMIT | DB_THREAD,
-                                  0600);
+                                  0600
+               );
                if (ret) {
-                       CtdlLogPrintf(CTDL_EMERG, "db_open[%02x]: %s\n", i,
-                               db_strerror(ret));
+                       syslog(LOG_EMERG, "db_open[%02x]: %s\n", i, db_strerror(ret));
+                       if (ret == ENOMEM) {
+                               syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php/faq:troubleshooting:out_of_lock_entries for more information.\n");
+                       }
+                       syslog(LOG_EMERG, "exit code %d\n", ret);
                        exit(CTDLEXIT_DB);
                }
        }
@@ -417,10 +408,10 @@ void cdb_chmod_data(void) {
                        if (d->d_name[0] != '.') {
                                snprintf(filename, sizeof filename,
                                         "%s/%s", ctdl_data_dir, d->d_name);
-                               CtdlLogPrintf(9, "chmod(%s, 0600) returned %d\n",
+                               syslog(LOG_DEBUG, "chmod(%s, 0600) returned %d\n",
                                        filename, chmod(filename, 0600)
                                );
-                               CtdlLogPrintf(9, "chown(%s, CTDLUID, -1) returned %d\n",
+                               syslog(LOG_DEBUG, "chown(%s, CTDLUID, -1) returned %d\n",
                                        filename, chown(filename, CTDLUID, (-1))
                                );
                        }
@@ -428,8 +419,7 @@ void cdb_chmod_data(void) {
                closedir(dp);
        }
 
-       CtdlLogPrintf(CTDL_DEBUG, "open_databases() finished\n");
-
+       syslog(LOG_DEBUG, "open_databases() finished\n");
        CtdlRegisterProtoHook(cmd_cull, "CULL", "Cull database logs");
 }
 
@@ -443,10 +433,8 @@ void close_databases(void)
        int a;
        int ret;
 
-       ctdl_thread_internal_free_tsd();
-       
        if ((ret = dbenv->txn_checkpoint(dbenv, 0, 0, 0))) {
-               CtdlLogPrintf(CTDL_EMERG,
+               syslog(LOG_EMERG,
                        "txn_checkpoint: %s\n", db_strerror(ret));
        }
 
@@ -457,11 +445,10 @@ void close_databases(void)
 
        /* close the tables */
        for (a = 0; a < MAXCDB; ++a) {
-               CtdlLogPrintf(CTDL_INFO, "Closing database %02x\n", a);
+               syslog(LOG_INFO, "Closing database %02x\n", a);
                ret = dbp[a]->close(dbp[a], 0);
                if (ret) {
-                       CtdlLogPrintf(CTDL_EMERG,
-                               "db_close: %s\n", db_strerror(ret));
+                       syslog(LOG_EMERG, "db_close: %s\n", db_strerror(ret));
                }
 
        }
@@ -469,34 +456,37 @@ void close_databases(void)
        /* Close the handle. */
        ret = dbenv->close(dbenv, 0);
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG,
-                       "DBENV->close: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "DBENV->close: %s\n", db_strerror(ret));
        }
 }
 
 
 /*
- * Compression functions only used if we have zlib
+ * Decompress a database item if it was compressed on disk
  */
-#ifdef HAVE_ZLIB
-
 void cdb_decompress_if_necessary(struct cdbdata *cdb)
 {
        static int magic = COMPRESS_MAGIC;
+
+       if ((cdb == NULL) || 
+           (cdb->ptr == NULL) || 
+           (cdb->len < sizeof(magic)) ||
+           (memcmp(cdb->ptr, &magic, sizeof(magic))))
+           return;
+
+       /* At this point we know we're looking at a compressed item. */
+
        struct CtdlCompressHeader zheader;
        char *uncompressed_data;
        char *compressed_data;
        uLongf destLen, sourceLen;
+       size_t cplen;
 
-       if (cdb == NULL)
-               return;
-       if (cdb->ptr == NULL)
-               return;
-       if (memcmp(cdb->ptr, &magic, sizeof(magic)))
-               return;
-
-       /* At this point we know we're looking at a compressed item. */
-       memcpy(&zheader, cdb->ptr, sizeof(struct CtdlCompressHeader));
+       memset(&zheader, 0, sizeof(struct CtdlCompressHeader));
+       cplen = sizeof(struct CtdlCompressHeader);
+       if (sizeof(struct CtdlCompressHeader) > cdb->len)
+               cplen = cdb->len;
+       memcpy(&zheader, cdb->ptr, cplen);
 
        compressed_data = cdb->ptr;
        compressed_data += sizeof(struct CtdlCompressHeader);
@@ -509,7 +499,7 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb)
                       (uLongf *) & destLen,
                       (const Bytef *) compressed_data,
                       (uLong) sourceLen) != Z_OK) {
-               CtdlLogPrintf(CTDL_EMERG, "uncompress() error\n");
+               syslog(LOG_EMERG, "uncompress() error\n");
                abort();
        }
 
@@ -518,27 +508,24 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb)
        cdb->ptr = uncompressed_data;
 }
 
-#endif                         /* HAVE_ZLIB */
 
 
 /*
  * Store a piece of data.  Returns 0 if the operation was successful.  If a
  * key already exists it should be overwritten.
  */
-int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
+int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen)
 {
 
        DBT dkey, ddata;
        DB_TXN *tid;
        int ret = 0;
 
-#ifdef HAVE_ZLIB
        struct CtdlCompressHeader zheader;
        char *compressed_data = NULL;
        int compressing = 0;
        size_t buffer_len = 0;
        uLongf destLen = 0;
-#endif
 
        memset(&dkey, 0, sizeof(DBT));
        memset(&ddata, 0, sizeof(DBT));
@@ -547,7 +534,6 @@ int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
        ddata.size = cdatalen;
        ddata.data = cdata;
 
-#ifdef HAVE_ZLIB
        /* Only compress Visit records.  Everything else is uncompressed. */
        if (cdb == CDB_VISIT) {
                compressing = 1;
@@ -557,43 +543,34 @@ int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
                    + sizeof(struct CtdlCompressHeader);
                destLen = (uLongf) buffer_len;
                compressed_data = malloc(buffer_len);
-               if (compress2((Bytef *) (compressed_data +
-                                        sizeof(struct
-                                               CtdlCompressHeader)),
-                             &destLen, (Bytef *) cdata, (uLongf) cdatalen,
-                             1) != Z_OK) {
-                       CtdlLogPrintf(CTDL_EMERG, "compress2() error\n");
+               if (compress2((Bytef *) (compressed_data + sizeof(struct CtdlCompressHeader)),
+                       &destLen, (Bytef *) cdata, (uLongf) cdatalen, 1) != Z_OK)
+               {
+                       syslog(LOG_EMERG, "compress2() error\n");
                        abort();
                }
                zheader.compressed_len = (size_t) destLen;
-               memcpy(compressed_data, &zheader,
-                      sizeof(struct CtdlCompressHeader));
-               ddata.size = (size_t) (sizeof(struct CtdlCompressHeader) +
-                                      zheader.compressed_len);
+               memcpy(compressed_data, &zheader, sizeof(struct CtdlCompressHeader));
+               ddata.size = (size_t) (sizeof(struct CtdlCompressHeader) + zheader.compressed_len);
                ddata.data = compressed_data;
        }
-#endif
 
-       if (MYTID != NULL) {
+       if (TSD->tid != NULL) {
                ret = dbp[cdb]->put(dbp[cdb],   /* db */
-                                   MYTID,      /* transaction ID */
+                                   TSD->tid,   /* transaction ID */
                                    &dkey,      /* key */
                                    &ddata,     /* data */
                                    0); /* flags */
                if (ret) {
-                       CtdlLogPrintf(CTDL_EMERG, "cdb_store(%d): %s\n", cdb,
-                               db_strerror(ret));
+                       syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret));
                        abort();
                }
-#ifdef HAVE_ZLIB
                if (compressing)
                        free(compressed_data);
-#endif
                return ret;
 
        } else {
-               bailIfCursor(MYCURSORS,
-                            "attempt to write during r/o cursor");
+               bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
 
              retry:
                txbegin(&tid);
@@ -607,16 +584,14 @@ int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
                                txabort(tid);
                                goto retry;
                        } else {
-                               CtdlLogPrintf(CTDL_EMERG, "cdb_store(%d): %s\n",
-                                       cdb, db_strerror(ret));
+                               syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret));
                                abort();
                        }
                } else {
                        txcommit(tid);
-#ifdef HAVE_ZLIB
-                       if (compressing)
+                       if (compressing) {
                                free(compressed_data);
-#endif
+                       }
                        return ret;
                }
        }
@@ -637,17 +612,16 @@ int cdb_delete(int cdb, void *key, int keylen)
        dkey.size = keylen;
        dkey.data = key;
 
-       if (MYTID != NULL) {
-               ret = dbp[cdb]->del(dbp[cdb], MYTID, &dkey, 0);
+       if (TSD->tid != NULL) {
+               ret = dbp[cdb]->del(dbp[cdb], TSD->tid, &dkey, 0);
                if (ret) {
-                       CtdlLogPrintf(CTDL_EMERG, "cdb_delete(%d): %s\n", cdb,
-                               db_strerror(ret));
-                       if (ret != DB_NOTFOUND)
+                       syslog(LOG_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
+                       if (ret != DB_NOTFOUND) {
                                abort();
+                       }
                }
        } else {
-               bailIfCursor(MYCURSORS,
-                            "attempt to delete during r/o cursor");
+               bailIfCursor(TSD->cursors, "attempt to delete during r/o cursor");
 
              retry:
                txbegin(&tid);
@@ -658,7 +632,7 @@ int cdb_delete(int cdb, void *key, int keylen)
                                txabort(tid);
                                goto retry;
                        } else {
-                               CtdlLogPrintf(CTDL_EMERG, "cdb_delete(%d): %s\n",
+                               syslog(LOG_EMERG, "cdb_delete(%d): %s\n",
                                        cdb, db_strerror(ret));
                                abort();
                        }
@@ -674,15 +648,13 @@ static DBC *localcursor(int cdb)
        int ret;
        DBC *curs;
 
-       if (MYCURSORS[cdb] == NULL)
-               ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &curs, 0);
+       if (TSD->cursors[cdb] == NULL)
+               ret = dbp[cdb]->cursor(dbp[cdb], TSD->tid, &curs, 0);
        else
-               ret =
-                   MYCURSORS[cdb]->c_dup(MYCURSORS[cdb], &curs,
-                                         DB_POSITION);
+               ret = TSD->cursors[cdb]->c_dup(TSD->cursors[cdb], &curs, DB_POSITION);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "localcursor: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "localcursor: %s\n", db_strerror(ret));
                abort();
        }
 
@@ -695,7 +667,7 @@ static DBC *localcursor(int cdb)
  * a struct cdbdata which it is the caller's responsibility to free later on
  * using the cdb_free() routine.
  */
-struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
+struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen)
 {
 
        struct cdbdata *tempcdb;
@@ -706,10 +678,10 @@ struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
        dkey.size = keylen;
        dkey.data = key;
 
-       if (MYTID != NULL) {
+       if (TSD->tid != NULL) {
                memset(&dret, 0, sizeof(DBT));
                dret.flags = DB_DBT_MALLOC;
-               ret = dbp[cdb]->get(dbp[cdb], MYTID, &dkey, &dret, 0);
+               ret = dbp[cdb]->get(dbp[cdb], TSD->tid, &dkey, &dret, 0);
        } else {
                DBC *curs;
 
@@ -727,8 +699,7 @@ struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
        }
 
        if ((ret != 0) && (ret != DB_NOTFOUND)) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_fetch(%d): %s\n", cdb,
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
                abort();
        }
 
@@ -737,16 +708,13 @@ struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
        tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata));
 
        if (tempcdb == NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
-                       "cdb_fetch: Cannot allocate memory for tempcdb\n");
+               syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
                abort();
        }
 
        tempcdb->len = dret.size;
        tempcdb->ptr = dret.data;
-#ifdef HAVE_ZLIB
        cdb_decompress_if_necessary(tempcdb);
-#endif
        return (tempcdb);
 }
 
@@ -769,10 +737,11 @@ void cdb_free(struct cdbdata *cdb)
 
 void cdb_close_cursor(int cdb)
 {
-       if (MYCURSORS[cdb] != NULL)
-               cclose(MYCURSORS[cdb]);
+       if (TSD->cursors[cdb] != NULL) {
+               cclose(TSD->cursors[cdb]);
+       }
 
-       MYCURSORS[cdb] = NULL;
+       TSD->cursors[cdb] = NULL;
 }
 
 /* 
@@ -784,21 +753,19 @@ void cdb_rewind(int cdb)
 {
        int ret = 0;
 
-       if (MYCURSORS[cdb] != NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
-                       "cdb_rewind: must close cursor on database %d before reopening.\n",
-                       cdb);
+       if (TSD->cursors[cdb] != NULL) {
+               syslog(LOG_EMERG,
+                       "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
                abort();
-               /* cclose(MYCURSORS[cdb]); */
+               /* cclose(TSD->cursors[cdb]); */
        }
 
        /*
         * Now initialize the cursor
         */
-       ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &MYCURSORS[cdb], 0);
+       ret = dbp[cdb]->cursor(dbp[cdb], TSD->tid, &TSD->cursors[cdb], 0);
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_rewind: db_cursor: %s\n",
-                       db_strerror(ret));
+               syslog(LOG_EMERG, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
                abort();
        }
 }
@@ -819,25 +786,21 @@ struct cdbdata *cdb_next_item(int cdb)
        memset(&data, 0, sizeof(data));
        data.flags = DB_DBT_MALLOC;
 
-       ret = MYCURSORS[cdb]->c_get(MYCURSORS[cdb], &key, &data, DB_NEXT);
+       ret = TSD->cursors[cdb]->c_get(TSD->cursors[cdb], &key, &data, DB_NEXT);
 
        if (ret) {
                if (ret != DB_NOTFOUND) {
-                       CtdlLogPrintf(CTDL_EMERG, "cdb_next_item(%d): %s\n",
-                               cdb, db_strerror(ret));
+                       syslog(LOG_EMERG, "cdb_next_item(%d): %s\n", cdb, db_strerror(ret));
                        abort();
                }
-               cclose(MYCURSORS[cdb]);
-               MYCURSORS[cdb] = NULL;
+               cdb_close_cursor(cdb);
                return NULL;    /* presumably, end of file */
        }
 
        cdbret = (struct cdbdata *) malloc(sizeof(struct cdbdata));
        cdbret->len = data.size;
        cdbret->ptr = data.data;
-#ifdef HAVE_ZLIB
        cdb_decompress_if_necessary(cdbret);
-#endif
 
        return (cdbret);
 }
@@ -851,16 +814,14 @@ struct cdbdata *cdb_next_item(int cdb)
 void cdb_begin_transaction(void)
 {
 
-       bailIfCursor(MYCURSORS,
-                    "can't begin transaction during r/o cursor");
+       bailIfCursor(TSD->cursors, "can't begin transaction during r/o cursor");
 
-       if (MYTID != NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
-                       "cdb_begin_transaction: ERROR: nested transaction\n");
+       if (TSD->tid != NULL) {
+               syslog(LOG_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
                abort();
        }
 
-       txbegin(&MYTID);
+       txbegin(&TSD->tid);
 }
 
 void cdb_end_transaction(void)
@@ -868,22 +829,23 @@ void cdb_end_transaction(void)
        int i;
 
        for (i = 0; i < MAXCDB; i++)
-               if (MYCURSORS[i] != NULL) {
-                       CtdlLogPrintf(CTDL_WARNING,
+               if (TSD->cursors[i] != NULL) {
+                       syslog(LOG_WARNING,
                                "cdb_end_transaction: WARNING: cursor %d still open at transaction end\n",
                                i);
-                       cclose(MYCURSORS[i]);
-                       MYCURSORS[i] = NULL;
+                       cclose(TSD->cursors[i]);
+                       TSD->cursors[i] = NULL;
                }
 
-       if (MYTID == NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
+       if (TSD->tid == NULL) {
+               syslog(LOG_EMERG,
                        "cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
                abort();
-       } else
-               txcommit(MYTID);
+       } else {
+               txcommit(TSD->tid);
+       }
 
-       MYTID = NULL;
+       TSD->tid = NULL;
 }
 
 /*
@@ -895,13 +857,11 @@ void cdb_trunc(int cdb)
        int ret;
        u_int32_t count;
 
-       if (MYTID != NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
-                       "cdb_trunc must not be called in a transaction.\n");
+       if (TSD->tid != NULL) {
+               syslog(LOG_EMERG, "cdb_trunc must not be called in a transaction.");
                abort();
        } else {
-               bailIfCursor(MYCURSORS,
-                            "attempt to write during r/o cursor");
+               bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
 
              retry:
                /* txbegin(&tid); */
@@ -914,10 +874,11 @@ void cdb_trunc(int cdb)
                                /* txabort(tid); */
                                goto retry;
                        } else {
-                               CtdlLogPrintf(CTDL_EMERG,
-                                       "cdb_truncate(%d): %s\n", cdb,
-                                       db_strerror(ret));
-                               abort();
+                               syslog(LOG_EMERG, "cdb_truncate(%d): %s\n", cdb, db_strerror(ret));
+                               if (ret == ENOMEM) {
+                                       syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php/faq:troubleshooting:out_of_lock_entries for more information.");
+                               }
+                               exit(CTDLEXIT_DB);
                        }
                } else {
                        /* txcommit(tid); */