New versions of Berkeley DB (I tested with 4.5.20) seem to

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index a87787f886993b705656a44e588ec606ac1fd8da..7f9551ebc8bec39dfbbc10a4b409291fcb24c1b7 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -37,6 +37,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <grp.h>
+#include <pwd.h>
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
@@ -50,9 +51,11 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
+#include "control.h"
 #include "database.h"
 #include "housekeeping.h"
 #include "tools.h"
+#include "citadel_dirs.c"
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -71,10 +74,18 @@ int main(int argc, char **argv)
 {
        char facility[32];
        int a, i;                       /* General-purpose variables */
-       struct passwd *pw;
+       struct passwd pw, *pwp = NULL;
+       char pwbuf[SIZ];
        int drop_root_perms = 1;
        size_t size;
-
+       int relh=0;
+       int home=0;
+       char relhome[PATH_MAX]="";
+       char ctdldir[PATH_MAX]=CTDLDIR;
+#ifdef HAVE_RUN_DIR
+       struct stat filestats;
+#endif
+       
        /* initialize the master context */
        InitializeMasterCC();
 
@@ -98,9 +109,14 @@ int main(int argc, char **argv)
                }
 
                else if (!strncmp(argv[a], "-h", 2)) {
-                       safestrncpy(ctdl_home_directory, &argv[a][2],
-                                   sizeof ctdl_home_directory);
+                       relh=argv[a][2]!='/';
+                       if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
+                                                                  sizeof ctdl_home_directory);
+                       else
+                               safestrncpy(relhome, &argv[a][2],
+                                                       sizeof relhome);
                        home_specified = 1;
+                       home=1;
                }
 
                else if (!strncmp(argv[a], "-t", 2)) {
@@ -130,6 +146,8 @@ int main(int argc, char **argv)
 
        }
 
+       calc_dirs_n_files(relh, home, relhome, ctdldir);
+
        /* daemonize, if we were asked to */
        if (running_as_daemon) {
                start_daemon(0);
@@ -142,12 +160,7 @@ int main(int argc, char **argv)
         * facilities when we need to...
         */
        if (enable_syslog) {
-               if (running_as_daemon) {
-                       openlog("citadel", LOG_NDELAY, 0);
-               }
-               else {
-                       openlog("citadel", LOG_PERROR|LOG_NDELAY, 0);
-               }
+               openlog("citadel", LOG_NDELAY, 0);
                setlogmask(LOG_UPTO(verbosity));
        }
        
@@ -158,7 +171,7 @@ int main(int argc, char **argv)
                "*** Citadel server engine v%d.%02d ***\n",
                (REV_LEVEL/100), (REV_LEVEL%100));
        lprintf(CTDL_NOTICE,
-               "Copyright (C) 1987-2005 by the Citadel development team.\n");
+               "Copyright (C) 1987-2007 by the Citadel development team.\n");
        lprintf(CTDL_NOTICE,
                "This program is distributed under the terms of the GNU "
                "General Public License.\n");
@@ -171,6 +184,25 @@ int main(int argc, char **argv)
        config.c_ipgm_secret = rand();
        put_config();
 
+       lprintf(CTDL_INFO, "Acquiring control record\n");
+       get_control();
+
+#ifdef HAVE_RUN_DIR
+       /* on some dists rundir gets purged on startup. so we need to recreate it. */
+
+       if (stat(ctdl_run_dir, &filestats)==-1){
+#ifdef SOLARIS_GETPWUID
+               pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+#else
+               getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+#endif
+               mkdir(ctdl_run_dir, 0755);
+               chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
+       }
+                       
+
+#endif
+
        /* Initialize... */
        init_sysdep();
 
@@ -183,15 +215,10 @@ int main(int argc, char **argv)
         * Bind the server to a Unix-domain socket.
         */
        CtdlRegisterServiceHook(0,
-#ifndef HAVE_RUN_DIR
-                                        "."
-#else
-                                        RUN_DIR
-#endif
-                               "/citadel.socket",
-                               citproto_begin_session,
-                               do_command_loop,
-                               do_async_loop);
+                                                       file_citadel_socket,
+                                                       citproto_begin_session,
+                                                       do_command_loop,
+                                                       do_async_loop);
 
        /*
         * Bind the server to our favorite TCP port (usually 504).
@@ -214,14 +241,21 @@ int main(int argc, char **argv)
         * corresponding group ids
         */
        if (drop_root_perms) {
-               if ((pw = getpwuid(CTDLUID)) == NULL)
+               cdb_chmod_data();       /* make sure we own our data files */
+
+#ifdef SOLARIS_GETPWUID
+               pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+#else
+               getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+#endif
+               if (pwp == NULL)
                        lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
                                   "Group IDs will be incorrect.\n", (long)CTDLUID,
                                strerror(errno));
                else {
-                       initgroups(pw->pw_name, pw->pw_gid);
-                       if (setgid(pw->pw_gid))
-                               lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw->pw_gid,
+                       initgroups(pw.pw_name, pw.pw_gid);
+                       if (setgid(pw.pw_gid))
+                               lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
                                        strerror(errno));
                }
                lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);