Simple concurrency lock to prevent multiple citservers running at the same time
[citadel.git] / citadel / database.c
index 95c69476e7e4be641a13ca4c3696f27e82845f5f..dbfac8dd54ebc1522ea588b2d87c483457183794 100644 (file)
@@ -1,21 +1,15 @@
 /*
  * This is a data store backend for the Citadel server which uses Berkeley DB.
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
  *
- *  This program is free 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 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.
- *
- *  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
+ * 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.
  *
  */
 
 /*****************************************************************************/
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
+#include <zlib.h>
 
 #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 "citadel.h"
-#include "server.h"
-#include "citserver.h"
-#include "database.h"
-#include "msgbase.h"
-#include "sysdep_decls.h"
-#include "threads.h"
-#include "config.h"
-#include "control.h"
 
 #include "ctdl_module.h"
-
+#include "control.h"
+#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) */
 
 
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#endif
+void cdb_abort(void) {
+       syslog(LOG_DEBUG,
+               "citserver is stopping in order to prevent data loss. uid=%d gid=%d euid=%d egid=%d",
+               getuid(),
+               getgid(),
+               geteuid(),
+               getegid()
+       );
+       cit_backtrace();
+       exit(CTDLEXIT_DB);
+}
 
 
 /* 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);
+               cit_backtrace();
        }
 }
 
@@ -92,7 +80,10 @@ 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, "DB: %s\n", msg);
+       int *FOO = NULL;
+       syslog(LOG_ALERT, "DB: %s", msg);
+       cit_backtrace();
+       *FOO = 1;
 }
 
 
@@ -104,8 +95,8 @@ static void txabort(DB_TXN * tid)
        ret = tid->abort(tid);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "bdb(): txn_abort: %s\n", db_strerror(ret));
-               abort();
+               syslog(LOG_EMERG, "bdb(): txn_abort: %s", db_strerror(ret));
+               cdb_abort();
        }
 }
 
@@ -117,8 +108,8 @@ static void txcommit(DB_TXN * tid)
        ret = tid->commit(tid, 0);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "bdb(): txn_commit: %s\n", db_strerror(ret));
-               abort();
+               syslog(LOG_EMERG, "bdb(): txn_commit: %s", db_strerror(ret));
+               cdb_abort();
        }
 }
 
@@ -130,14 +121,15 @@ static void txbegin(DB_TXN ** tid)
        ret = dbenv->txn_begin(dbenv, NULL, tid, 0);
 
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "bdb(): txn_begin: %s\n", db_strerror(ret));
-               abort();
+               syslog(LOG_EMERG, "bdb(): txn_begin: %s", db_strerror(ret));
+               cdb_abort();
        }
 }
 
 static void dbpanic(DB_ENV * env, int errval)
 {
-       CtdlLogPrintf(CTDL_EMERG, "bdb(): PANIC: %s\n", db_strerror(errval));
+       syslog(LOG_EMERG, "bdb(): PANIC: %s", db_strerror(errval));
+       cit_backtrace();
 }
 
 static void cclose(DBC * cursor)
@@ -145,8 +137,8 @@ static void cclose(DBC * cursor)
        int ret;
 
        if ((ret = cursor->c_close(cursor))) {
-               CtdlLogPrintf(CTDL_EMERG, "bdb(): c_close: %s\n", db_strerror(ret));
-               abort();
+               syslog(LOG_EMERG, "bdb(): c_close: %s", db_strerror(ret));
+               cdb_abort();
        }
 }
 
@@ -156,36 +148,27 @@ static void bailIfCursor(DBC ** cursors, const char *msg)
 
        for (i = 0; i < MAXCDB; i++)
                if (cursors[i] != NULL) {
-                       CtdlLogPrintf(CTDL_EMERG,
-                               "bdb(): cursor still in progress on cdb %02x: %s\n", i, msg);
-                       abort();
+                       syslog(LOG_EMERG, "bdb(): cursor still in progress on cdb %02x: %s", i, msg);
+                       cdb_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, "bdb(): 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!");
+               cdb_abort();
+       }
 }
 
 
 /*
  * Cull the database logs
  */
-static void cdb_cull_logs(void)
+void cdb_cull_logs(void)
 {
        u_int32_t flags;
        int ret;
@@ -196,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),
@@ -221,15 +204,6 @@ static void cdb_cull_logs(void)
        }
 }
 
-/*
- * Manually initiate log file cull.
- */
-void cmd_cull(char *argbuf) {
-       if (CtdlAccessCheck(ac_internal)) return;
-       cdb_cull_logs();
-       cprintf("%d Database log file cull completed.\n", CIT_OK);
-}
-
 
 /*
  * Request a checkpoint of the database.  Called once per minute by the thread manager.
@@ -238,16 +212,16 @@ void cdb_checkpoint(void)
 {
        int ret;
 
-       CtdlLogPrintf(CTDL_DEBUG, "-- db checkpoint --\n");
+       MARKM_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));
-               abort();
+               syslog(LOG_EMERG, "cdb_checkpoint: txn_checkpoint: %s", db_strerror(ret));
+               cdb_abort();
        }
 
        /* After a successful checkpoint, we can cull the unused logs */
-       if (config.c_auto_cull) {
+       if (CtdlGetConfigInt("c_auto_cull")) {
                cdb_cull_logs();
        }
 }
@@ -267,68 +241,44 @@ void open_databases(void)
        char dbfilename[32];
        u_int32_t flags = 0;
        int dbversion_major, dbversion_minor, dbversion_patch;
-       int current_dbversion = 0;
-
-       CtdlLogPrintf(CTDL_DEBUG, "bdb(): open_databases() starting\n");
-       CtdlLogPrintf(CTDL_DEBUG, "Compiled db: %s\n", DB_VERSION_STRING);
-       CtdlLogPrintf(CTDL_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);
-
-       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");
-               exit(CTDLEXIT_DB);
-       }
-
-       CitControl.MMdbversion = current_dbversion;
-       put_control();
 
-#ifdef HAVE_ZLIB
-       CtdlLogPrintf(CTDL_INFO, "Linked zlib: %s\n", zlibVersion());
-#endif
+       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));
+       syslog(LOG_INFO, "Linked zlib: %s\n", zlibVersion());
 
        /*
         * Silently try to create the database subdirectory.  If it's
         * already there, no problem.
         */
        if ((mkdir(ctdl_data_dir, 0700) != 0) && (errno != EEXIST)){
-               CtdlLogPrintf(CTDL_EMERG, 
+               syslog(LOG_EMERG, 
                              "unable to create database directory [%s]: %s", 
                              ctdl_data_dir, strerror(errno));
        }
        if (chmod(ctdl_data_dir, 0700) != 0){
-               CtdlLogPrintf(CTDL_EMERG, 
+               syslog(LOG_EMERG, 
                              "unable to set database directory accessrights [%s]: %s", 
                              ctdl_data_dir, strerror(errno));
        }
        if (chown(ctdl_data_dir, CTDLUID, (-1)) != 0){
-               CtdlLogPrintf(CTDL_EMERG, 
+               syslog(LOG_EMERG, 
                              "unable to set the owner for [%s]: %s", 
                              ctdl_data_dir, strerror(errno));
        }
-       CtdlLogPrintf(CTDL_DEBUG, "bdb(): Setting up DB environment\n");
-       db_env_set_func_yield((int (*)(u_long,  u_long))sched_yield);
+       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, "bdb(): db_env_create: %s\n", db_strerror(ret));
-               CtdlLogPrintf(CTDL_EMERG, "exit code %d\n", 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");
        dbenv->set_paniccall(dbenv, dbpanic);
        dbenv->set_errcall(dbenv, cdb_verbose_err);
        dbenv->set_errpfx(dbenv, "ctdl");
-#if (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);
 
@@ -338,51 +288,51 @@ void open_databases(void)
         */
        ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
        if (ret) {
-               CtdlLogPrintf(CTDL_EMERG, "bdb(): set_cachesize: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): set_cachesize: %s\n", db_strerror(ret));
                dbenv->close(dbenv, 0);
-               CtdlLogPrintf(CTDL_EMERG, "exit code %d\n", ret);
+               syslog(LOG_EMERG, "exit code %d\n", ret);
                exit(CTDLEXIT_DB);
        }
 
        if ((ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT))) {
-               CtdlLogPrintf(CTDL_EMERG, "bdb(): set_lk_detect: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "bdb(): set_lk_detect: %s\n", db_strerror(ret));
                dbenv->close(dbenv, 0);
-               CtdlLogPrintf(CTDL_EMERG, "exit code %d\n", ret);
+               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_EMERG, "dbenv->open: %s\n", db_strerror(ret));
+               syslog(LOG_EMERG, "dbenv->open: %s\n", db_strerror(ret));
                dbenv->close(dbenv, 0);
-               CtdlLogPrintf(CTDL_EMERG, "exit code %d\n", ret);
+               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_EMERG, "db_create: %s\n", db_strerror(ret));
-                       CtdlLogPrintf(CTDL_EMERG, "exit code %d\n", ret);
+                       syslog(LOG_EMERG, "db_create: %s\n", db_strerror(ret));
+                       syslog(LOG_EMERG, "exit code %d\n", ret);
                        exit(CTDLEXIT_DB);
                }
 
@@ -401,11 +351,11 @@ void open_databases(void)
                                   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) {
-                               CtdlLogPrintf(CTDL_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, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
                        }
-                       CtdlLogPrintf(CTDL_EMERG, "exit code %d\n", ret);
+                       syslog(LOG_EMERG, "exit code %d\n", ret);
                        exit(CTDLEXIT_DB);
                }
        }
@@ -427,10 +377,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))
                                );
                        }
@@ -438,8 +388,7 @@ void cdb_chmod_data(void) {
                closedir(dp);
        }
 
-       CtdlLogPrintf(CTDL_DEBUG, "open_databases() finished\n");
-       CtdlRegisterProtoHook(cmd_cull, "CULL", "Cull database logs");
+       syslog(LOG_DEBUG, "open_databases() finished\n");
 }
 
 
@@ -452,10 +401,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));
        }
 
@@ -466,10 +413,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));
                }
 
        }
@@ -477,13 +424,13 @@ 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
  */
 void cdb_decompress_if_necessary(struct cdbdata *cdb)
 {
@@ -495,7 +442,6 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb)
            (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;
@@ -521,17 +467,13 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb)
                       (uLongf *) & destLen,
                       (const Bytef *) compressed_data,
                       (uLong) sourceLen) != Z_OK) {
-               CtdlLogPrintf(CTDL_EMERG, "uncompress() error\n");
-               abort();
+               syslog(LOG_EMERG, "uncompress() error\n");
+               cdb_abort();
        }
 
        free(cdb->ptr);
        cdb->len = (size_t) destLen;
        cdb->ptr = uncompressed_data;
-#else                          /* HAVE_ZLIB */
-       CtdlLogPrintf(CTDL_EMERG, "Database contains compressed data, but this citserver was built without compression support.\n");
-       abort();
-#endif                         /* HAVE_ZLIB */
 }
 
 
@@ -547,22 +489,21 @@ int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen)
        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));
        dkey.size = ckeylen;
+       /* no, we don't care for this error. */
        dkey.data = ckey;
+
        ddata.size = cdatalen;
        ddata.data = cdata;
 
-#ifdef HAVE_ZLIB
        /* Only compress Visit records.  Everything else is uncompressed. */
        if (cdb == CDB_VISIT) {
                compressing = 1;
@@ -575,34 +516,31 @@ int cdb_store(int cdb, const void *ckey, int ckeylen, void *cdata, int cdatalen)
                if (compress2((Bytef *) (compressed_data + sizeof(struct CtdlCompressHeader)),
                        &destLen, (Bytef *) cdata, (uLongf) cdatalen, 1) != Z_OK)
                {
-                       CtdlLogPrintf(CTDL_EMERG, "compress2() error\n");
-                       abort();
+                       syslog(LOG_EMERG, "compress2() error\n");
+                       cdb_abort();
                }
                zheader.compressed_len = (size_t) destLen;
                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));
-                       abort();
+                       syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret));
+                       cdb_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);
@@ -616,20 +554,18 @@ int cdb_store(int cdb, const 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));
-                               abort();
+                               syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret));
+                               cdb_abort();
                        }
                } else {
                        txcommit(tid);
-#ifdef HAVE_ZLIB
                        if (compressing) {
                                free(compressed_data);
                        }
-#endif
                        return ret;
                }
        }
+       return ret;
 }
 
 
@@ -647,16 +583,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));
+                       syslog(LOG_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
                        if (ret != DB_NOTFOUND) {
-                               abort();
+                               cdb_abort();
                        }
                }
        } else {
-               bailIfCursor(MYCURSORS, "attempt to delete during r/o cursor");
+               bailIfCursor(TSD->cursors, "attempt to delete during r/o cursor");
 
              retry:
                txbegin(&tid);
@@ -667,9 +603,9 @@ 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();
+                               cdb_abort();
                        }
                } else {
                        txcommit(tid);
@@ -683,16 +619,14 @@ 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));
-               abort();
+               syslog(LOG_EMERG, "localcursor: %s\n", db_strerror(ret));
+               cdb_abort();
        }
 
        return curs;
@@ -706,19 +640,19 @@ static DBC *localcursor(int cdb)
  */
 struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen)
 {
-
        struct cdbdata *tempcdb;
        DBT dkey, dret;
        int ret;
 
        memset(&dkey, 0, sizeof(DBT));
        dkey.size = keylen;
+       /* no we don't care about this error. */
        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;
 
@@ -736,8 +670,8 @@ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen)
        }
 
        if ((ret != 0) && (ret != DB_NOTFOUND)) {
-               CtdlLogPrintf(CTDL_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
-               abort();
+               syslog(LOG_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
+               cdb_abort();
        }
 
        if (ret != 0)
@@ -745,14 +679,17 @@ struct cdbdata *cdb_fetch(int cdb, const 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");
-               abort();
+               syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
+               cdb_abort();
+               return NULL; /* make it easier for static analysis... */
+       }
+       else
+       {
+               tempcdb->len = dret.size;
+               tempcdb->ptr = dret.data;
+               cdb_decompress_if_necessary(tempcdb);
+               return (tempcdb);
        }
-
-       tempcdb->len = dret.size;
-       tempcdb->ptr = dret.data;
-       cdb_decompress_if_necessary(tempcdb);
-       return (tempcdb);
 }
 
 
@@ -774,11 +711,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;
 }
 
 /* 
@@ -790,20 +727,20 @@ 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);
-               abort();
-               /* cclose(MYCURSORS[cdb]); */
+       if (TSD->cursors[cdb] != NULL) {
+               syslog(LOG_EMERG,
+                      "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
+               cdb_abort();
+               /* 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));
-               abort();
+               syslog(LOG_EMERG, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
+               cdb_abort();
        }
 }
 
@@ -823,15 +760,14 @@ 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));
-                       abort();
+                       syslog(LOG_EMERG, "cdb_next_item(%d): %s\n", cdb, db_strerror(ret));
+                       cdb_abort();
                }
-               cclose(MYCURSORS[cdb]);
-               MYCURSORS[cdb] = NULL;
+               cdb_close_cursor(cdb);
                return NULL;    /* presumably, end of file */
        }
 
@@ -852,14 +788,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");
-               abort();
+       if (TSD->tid != NULL) {
+               syslog(LOG_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
+               cdb_abort();
        }
 
-       txbegin(&MYTID);
+       txbegin(&TSD->tid);
 }
 
 void cdb_end_transaction(void)
@@ -867,23 +803,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();
+               cdb_abort();
        } else {
-               txcommit(MYTID);
+               txcommit(TSD->tid);
        }
 
-       MYTID = NULL;
+       TSD->tid = NULL;
 }
 
 /*
@@ -895,12 +831,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");
-               abort();
+       if (TSD->tid != NULL) {
+               syslog(LOG_EMERG, "cdb_trunc must not be called in a transaction.");
+               cdb_abort();
        } else {
-               bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
+               bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
 
              retry:
                /* txbegin(&tid); */
@@ -913,14 +848,152 @@ 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) {
-                                       CtdlLogPrintf(CTDL_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, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
                                }
-                               abort();
+                               exit(CTDLEXIT_DB);
                        }
                } else {
                        /* txcommit(tid); */
                }
        }
 }
+
+int SeentDebugEnabled = 0;
+
+#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SeentDebugEnabled != 0))
+#define SEENM_syslog(LEVEL, FORMAT)                                    \
+       DBGLOG(LEVEL) syslog(LEVEL,                                     \
+                            "%s[%ld]CC[%ld] SEEN[%s][%d] " FORMAT,     \
+                            IOSTR, ioid, ccid, Facility, cType)
+
+#define SEEN_syslog(LEVEL, FORMAT, ...)                                        \
+       DBGLOG(LEVEL) syslog(LEVEL,                                     \
+                            "%s[%ld]CC[%ld] SEEN[%s][%d] " FORMAT,     \
+                            IOSTR, ioid, ccid, Facility, cType,        \
+                            __VA_ARGS__)
+
+time_t CheckIfAlreadySeen(const char *Facility,
+                         StrBuf *guid,
+                         time_t now,
+                         time_t antiexpire,
+                         eCheckType cType,
+                         long ccid,
+                         long ioid)
+{
+       time_t InDBTimeStamp = 0;
+       struct UseTable ut;
+       struct cdbdata *cdbut;
+
+       if (cType != eWrite)
+       {
+               SEEN_syslog(LOG_DEBUG, "Loading [%s]", ChrPtr(guid));
+               cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
+               if ((cdbut != NULL) && (cdbut->ptr != NULL)) {
+                       memcpy(&ut, cdbut->ptr,
+                              ((cdbut->len > sizeof(struct UseTable)) ?
+                               sizeof(struct UseTable) : cdbut->len));
+                       InDBTimeStamp = now - ut.ut_timestamp;
+
+                       if (InDBTimeStamp < antiexpire)
+                       {
+                               SEEN_syslog(LOG_DEBUG, "Found - Not expired %ld < %ld", InDBTimeStamp, antiexpire);
+                               cdb_free(cdbut);
+                               return InDBTimeStamp;
+                       }
+                       else
+                       {
+                               SEEN_syslog(LOG_DEBUG, "Found - Expired. %ld >= %ld", InDBTimeStamp, antiexpire);
+                               cdb_free(cdbut);
+                       }
+               }
+               else
+               {
+                       if (cdbut) cdb_free(cdbut);
+                       
+                       SEENM_syslog(LOG_DEBUG, "not Found");
+                       if (cType == eCheckUpdate)
+                               return 0;
+               }
+
+               if (cType == eCheckExist)
+                       return InDBTimeStamp;
+       }
+
+       memcpy(ut.ut_msgid, SKEY(guid));
+       ut.ut_timestamp = now;
+
+       SEENM_syslog(LOG_DEBUG, "Saving new Timestamp");
+       /* rewrite the record anyway, to update the timestamp */
+       cdb_store(CDB_USETABLE,
+                 SKEY(guid),
+                 &ut, sizeof(struct UseTable) );
+
+       SEENM_syslog(LOG_DEBUG, "Done Saving");
+       return InDBTimeStamp;
+}
+
+
+void cmd_rsen(char *argbuf) {
+       char Token[SIZ];
+       long TLen;
+       char Time[SIZ];
+
+       struct UseTable ut;
+       struct cdbdata *cdbut;
+       
+       if (CtdlAccessCheck(ac_aide)) return;
+
+       TLen = extract_token(Token, argbuf, 1, '|', sizeof Token);
+       if (strncmp(argbuf, "GET", 3) == 0) {
+               cdbut = cdb_fetch(CDB_USETABLE, Token, TLen);
+               if (cdbut != NULL) {
+                       memcpy(&ut, cdbut->ptr,
+                              ((cdbut->len > sizeof(struct UseTable)) ?
+                               sizeof(struct UseTable) : cdbut->len));
+                       
+                       cprintf("%d %ld\n", CIT_OK, ut.ut_timestamp);
+               }
+               else {
+                       cprintf("%d not found\n", ERROR + NOT_HERE);
+               }
+
+       }
+       else if (strncmp(argbuf, "SET", 3) == 0) {
+               memcpy(ut.ut_msgid, Token, TLen);
+               extract_token(Time, argbuf, 2, '|', sizeof Time);
+               ut.ut_timestamp = atol(Time);
+               cdb_store(CDB_USETABLE,
+                         Token, TLen,
+                         &ut, sizeof(struct UseTable) );
+               cprintf("%d token updated\n", CIT_OK);
+       }
+       else if (strncmp(argbuf, "DEL", 3) == 0) {
+               if (cdb_delete(CDB_USETABLE, Token, TLen))
+                       cprintf("%d not found\n", ERROR + NOT_HERE);
+               else
+                       cprintf("%d deleted.\n", CIT_OK);
+
+       }
+       else {
+               cprintf("%d Usage: [GET|SET|DEL]|Token|timestamp\n", ERROR);
+       }
+
+}
+void LogDebugEnableSeenEnable(const int n)
+{
+       SeentDebugEnabled = n;
+}
+
+CTDL_MODULE_INIT(database)
+{
+       if (!threading)
+       {
+               CtdlRegisterDebugFlagHook(HKEY("SeenDebug"), LogDebugEnableSeenEnable, &SeentDebugEnabled);
+               CtdlRegisterProtoHook(cmd_rsen, "RSEN", "manipulate Aggregators seen database");
+       }
+
+       /* return our module id for the log */
+       return "database";
+}