Removed the logging facility from citserver, use syslog instead
[citadel.git] / citadel / database.c
index 891e31fb54eb294e9cbcff9f1db97f1940937512..d0aab07300d56305ba0c4203c74445b03c1317ad 100644 (file)
@@ -1,8 +1,22 @@
 /*
- * $Id$
- *
  * This is a data store backend for the Citadel server which uses Berkeley DB.
  *
+ * Copyright (c) 1987-2011 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 as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
  */
 
 /*****************************************************************************
@@ -28,6 +42,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <syslog.h>
 
 #ifdef HAVE_DB_H
 #include <db.h>
@@ -69,14 +84,16 @@ static DB_ENV *dbenv;               /* The DB environment (global) */
 /* Verbose logging callback */
 void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
 {
-       CtdlLogPrintf(CTDL_DEBUG, "BDB: %s\n", msg);
+       if (!IsEmptyStr(msg)) {
+               syslog(LOG_DEBUG, "DB: %s\n", 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\n", msg);
 }
 
 
@@ -88,8 +105,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\n", db_strerror(ret));
                abort();
        }
 }
@@ -102,8 +118,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\n", db_strerror(ret));
                abort();
        }
 }
@@ -116,15 +131,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\n", 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\n", db_strerror(errval));
 }
 
 static void cclose(DBC * cursor)
@@ -132,8 +146,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\n", db_strerror(ret));
                abort();
        }
 }
@@ -144,9 +157,8 @@ 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\n", i, msg);
                        abort();
                }
 }
@@ -159,8 +171,7 @@ void check_handles(void *arg)
                bailIfCursor(tsd->cursors, "in check_handles");
 
                if (tsd->tid != NULL) {
-                       CtdlLogPrintf(CTDL_EMERG,
-                               "cdb_*: transaction still in progress!");
+                       syslog(LOG_EMERG, "bdb(): transaction still in progress!");
                        abort();
                }
        }
@@ -186,14 +197,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\n", 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\n", *file);
                        ret = unlink(*file);
                        if (ret != 0) {
                                snprintf(errmsg, sizeof(errmsg),
@@ -204,7 +215,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);
@@ -222,31 +233,17 @@ void cmd_cull(char *argbuf) {
 
 
 /*
- * 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 --\n");
+       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\n", db_strerror(ret));
                abort();
        }
 
@@ -268,24 +265,24 @@ 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\n");
+       syslog(LOG_DEBUG, "Compiled db: %s\n", DB_VERSION_STRING);
+       syslog(LOG_INFO, "  Linked db: %s\n",
                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\n", current_dbversion);
+       syslog(LOG_DEBUG, "  Previous dbversion: %d\n", 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"
+               syslog(LOG_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");
@@ -296,23 +293,34 @@ void open_databases(void)
        put_control();
 
 #ifdef HAVE_ZLIB
-       CtdlLogPrintf(CTDL_INFO, "Linked zlib: %s\n", zlibVersion());
+       syslog(LOG_INFO, "Linked zlib: %s\n", zlibVersion());
 #endif
 
        /*
         * 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");
@@ -331,50 +339,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);
                }
 
@@ -390,10 +399,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);
                }
        }
@@ -415,10 +428,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))
                                );
                        }
@@ -426,8 +439,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");
 }
 
@@ -444,7 +456,7 @@ void close_databases(void)
        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));
        }
 
@@ -455,11 +467,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));
                }
 
        }
@@ -467,8 +478,7 @@ 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));
        }
 }
 
@@ -476,25 +486,30 @@ void close_databases(void)
 /*
  * Compression functions only used if we have zlib
  */
-#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;
+
+#ifdef HAVE_ZLIB
+       /* 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);
@@ -507,23 +522,26 @@ 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();
        }
 
        free(cdb->ptr);
        cdb->len = (size_t) destLen;
        cdb->ptr = uncompressed_data;
+#else                          /* HAVE_ZLIB */
+       syslog(LOG_EMERG, "Database contains compressed data, but this citserver was built without compression support.\n");
+       abort();
+#endif                         /* HAVE_ZLIB */
 }
 
-#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;
@@ -555,19 +573,15 @@ 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
@@ -579,8 +593,7 @@ int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
                                    &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\n", cdb, db_strerror(ret));
                        abort();
                }
 #ifdef HAVE_ZLIB
@@ -590,8 +603,7 @@ int cdb_store(int cdb, void *ckey, int ckeylen, void *cdata, int cdatalen)
                return ret;
 
        } else {
-               bailIfCursor(MYCURSORS,
-                            "attempt to write during r/o cursor");
+               bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
 
              retry:
                txbegin(&tid);
@@ -605,15 +617,16 @@ 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",
+                               syslog(LOG_EMERG, "cdb_store(%d): %s\n",
                                        cdb, db_strerror(ret));
                                abort();
                        }
                } else {
                        txcommit(tid);
 #ifdef HAVE_ZLIB
-                       if (compressing)
+                       if (compressing) {
                                free(compressed_data);
+                       }
 #endif
                        return ret;
                }
@@ -638,14 +651,13 @@ int cdb_delete(int cdb, void *key, int keylen)
        if (MYTID != NULL) {
                ret = dbp[cdb]->del(dbp[cdb], MYTID, &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(MYCURSORS, "attempt to delete during r/o cursor");
 
              retry:
                txbegin(&tid);
@@ -656,7 +668,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();
                        }
@@ -680,7 +692,7 @@ static DBC *localcursor(int cdb)
                                          DB_POSITION);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "localcursor: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "localcursor: %s\n", db_strerror(ret));
                abort();
        }
 
@@ -693,7 +705,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;
@@ -725,8 +737,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();
        }
 
@@ -735,16 +746,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);
 }
 
@@ -767,8 +775,9 @@ void cdb_free(struct cdbdata *cdb)
 
 void cdb_close_cursor(int cdb)
 {
-       if (MYCURSORS[cdb] != NULL)
+       if (MYCURSORS[cdb] != NULL) {
                cclose(MYCURSORS[cdb]);
+       }
 
        MYCURSORS[cdb] = NULL;
 }
@@ -783,9 +792,8 @@ 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);
+               syslog(LOG_EMERG,
+                       "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
                abort();
                /* cclose(MYCURSORS[cdb]); */
        }
@@ -795,8 +803,7 @@ void cdb_rewind(int cdb)
         */
        ret = dbp[cdb]->cursor(dbp[cdb], MYTID, &MYCURSORS[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();
        }
 }
@@ -821,8 +828,7 @@ struct cdbdata *cdb_next_item(int cdb)
 
        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]);
@@ -833,9 +839,7 @@ struct cdbdata *cdb_next_item(int cdb)
        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);
 }
@@ -849,12 +853,10 @@ struct cdbdata *cdb_next_item(int cdb)
 void cdb_begin_transaction(void)
 {
 
-       bailIfCursor(MYCURSORS,
-                    "can't begin transaction during r/o cursor");
+       bailIfCursor(MYCURSORS, "can't begin transaction during r/o cursor");
 
        if (MYTID != NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
-                       "cdb_begin_transaction: ERROR: nested transaction\n");
+               syslog(LOG_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
                abort();
        }
 
@@ -867,7 +869,7 @@ void cdb_end_transaction(void)
 
        for (i = 0; i < MAXCDB; i++)
                if (MYCURSORS[i] != NULL) {
-                       CtdlLogPrintf(CTDL_WARNING,
+                       syslog(LOG_WARNING,
                                "cdb_end_transaction: WARNING: cursor %d still open at transaction end\n",
                                i);
                        cclose(MYCURSORS[i]);
@@ -875,11 +877,12 @@ void cdb_end_transaction(void)
                }
 
        if (MYTID == NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
+               syslog(LOG_EMERG,
                        "cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
                abort();
-       } else
+       } else {
                txcommit(MYTID);
+       }
 
        MYTID = NULL;
 }
@@ -894,12 +897,11 @@ void cdb_trunc(int cdb)
        u_int32_t count;
 
        if (MYTID != NULL) {
-               CtdlLogPrintf(CTDL_EMERG,
+               syslog(LOG_EMERG,
                        "cdb_trunc must not be called in a transaction.\n");
                abort();
        } else {
-               bailIfCursor(MYCURSORS,
-                            "attempt to write during r/o cursor");
+               bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
 
              retry:
                /* txbegin(&tid); */
@@ -912,9 +914,10 @@ void cdb_trunc(int cdb)
                                /* txabort(tid); */
                                goto retry;
                        } else {
-                               CtdlLogPrintf(CTDL_EMERG,
-                                       "cdb_truncate(%d): %s\n", cdb,
-                                       db_strerror(ret));
+                               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.\n");
+                               }
                                abort();
                        }
                } else {