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 7c152d74439a047b3ca6b7b8bbdbe91ffd9a5900..7f9551ebc8bec39dfbbc10a4b409291fcb24c1b7 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -74,7 +74,8 @@ 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;
@@ -159,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));
        }
        
@@ -175,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-2006 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");
@@ -195,10 +191,13 @@ int main(int argc, char **argv)
        /* on some dists rundir gets purged on startup. so we need to recreate it. */
 
        if (stat(ctdl_run_dir, &filestats)==-1){
-               pw=getpwuid(config.c_ctdluid);
+#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, (pw==NULL)?-1:pw->pw_gid);
-
+               chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
        }
                        
 
@@ -242,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);