OPENID: if self service account creation is disabled - ApenID is also.

[citadel.git] / citadel / database.c

diff --git a/citadel/database.c b/citadel/database.c
index 0da1f0f19ab72ee86b75f13e90a78fdd9bdc2719..e2654b6e65fb010219e41d8807a1df2842579774 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -89,6 +89,7 @@ void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
 {
        if (!IsEmptyStr(msg)) {
                syslog(LOG_DEBUG, "DB: %s", msg);
+               cit_backtrace();
        }
 }
 
@@ -97,6 +98,7 @@ void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
 void cdb_verbose_err(const DB_ENV *dbenv, const char *errpfx, const char *msg)
 {
        syslog(LOG_ALERT, "DB: %s", msg);
+       cit_backtrace();
 }
 
 
@@ -142,6 +144,7 @@ static void txbegin(DB_TXN ** tid)
 static void dbpanic(DB_ENV * env, int errval)
 {
        syslog(LOG_EMERG, "bdb(): PANIC: %s", db_strerror(errval));
+       cit_backtrace();
 }
 
 static void cclose(DBC * cursor)
@@ -725,12 +728,15 @@ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen)
        if (tempcdb == NULL) {
                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);
 }
 
 
@@ -770,7 +776,7 @@ void cdb_rewind(int cdb)
 
        if (TSD->cursors[cdb] != NULL) {
                syslog(LOG_EMERG,
-                       "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
+                      "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
                cdb_abort();
                /* cclose(TSD->cursors[cdb]); */
        }