* Variable names, comments, documentation, etc... removed the acronym 'BBS'

[citadel.git] / citadel / database_sleepycat.c

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index fb9d6a53a4716d0cc495658b7e21006459a2c8e0..473071c340e84ab1f3505fa3e04498978c612485 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -55,7 +55,6 @@
 #include "database.h"
 #include "msgbase.h"
 #include "sysdep_decls.h"
-#include "tools.h"
 #include "config.h"
 
 static DB *dbp[MAXCDB];                /* One DB handle for each Citadel database */
@@ -285,7 +284,6 @@ void open_databases(void)
        char dbfilename[SIZ];
        u_int32_t flags = 0;
        char dbdirname[PATH_MAX];
-       char dblogname[PATH_MAX];
        DIR *dp;
        struct dirent *d;
        char filename[PATH_MAX];
@@ -293,8 +291,6 @@ void open_databases(void)
 
        getcwd(dbdirname, sizeof dbdirname);
        strcat(dbdirname, "/data");
-       getcwd(dblogname, sizeof dblogname);
-       strcat(dblogname, "/data_logs");
 
        lprintf(CTDL_DEBUG, "cdb_*: open_databases() starting\n");
        lprintf(CTDL_DEBUG, "Compiled db: %s\n", DB_VERSION_STRING);
@@ -309,14 +305,7 @@ void open_databases(void)
          */
        mkdir(dbdirname, 0700);
        chmod(dbdirname, 0700);
-       chown(dbdirname, BBSUID, (-1) );
-
-       /*      
-        * By default, keep database logs in the same directory.  A savvy
-        * system administrator will know what to do if he/she wants to put
-        * them elsewhere.
-        */
-       symlink("data", dblogname);
+       chown(dbdirname, CTDLUID, (-1) );
 
        lprintf(CTDL_DEBUG, "cdb_*: Setting up DB environment\n");
        db_env_set_func_yield(sched_yield);
@@ -345,22 +334,10 @@ void open_databases(void)
                exit(ret);
        }
 
-       if ((ret = dbenv->set_data_dir(dbenv, dbdirname))) {
-               lprintf(CTDL_EMERG, "cdb_*: set_data_dir: %s\n", db_strerror(ret));
-               dbenv->close(dbenv, 0);
-               exit(ret);
-       }
-
-       if ((ret = dbenv->set_lg_dir(dbenv, dblogname))) {
-               lprintf(CTDL_EMERG, "cdb_*: set_lg_dir: %s\n", db_strerror(ret));
-               dbenv->close(dbenv, 0);
-               exit(ret);
-       }
-
         flags = DB_CREATE|DB_RECOVER|DB_INIT_MPOOL|DB_PRIVATE|DB_INIT_TXN|
                DB_INIT_LOCK|DB_THREAD;
-       lprintf(CTDL_DEBUG, "dbenv->open(dbenv, NULL, %d, 0)\n", flags);
-        ret = dbenv->open(dbenv, NULL, flags, 0);
+       lprintf(CTDL_DEBUG, "dbenv->open(dbenv, %s, %d, 0)\n", dbdirname, flags);
+        ret = dbenv->open(dbenv, dbdirname, flags, 0);
        if (ret) {
                lprintf(CTDL_DEBUG, "cdb_*: dbenv->open: %s\n", db_strerror(ret));
                 dbenv->close(dbenv, 0);
@@ -416,7 +393,7 @@ void open_databases(void)
                                snprintf(filename, sizeof filename, "%s/%s",
                                        dbdirname, d->d_name);
                                chmod(filename, 0600);
-                               chown(filename, BBSUID, (-1) );
+                               chown(filename, CTDLUID, (-1) );
                        }
                }
                closedir(dp);