#include <errno.h>
#include <stdarg.h>
#include <grp.h>
+#include <pwd.h>
#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif
#include "citserver.h"
#include "support.h"
#include "config.h"
+#include "control.h"
#include "database.h"
+#include "user_ops.h"
#include "housekeeping.h"
#include "tools.h"
+#include "citadel_dirs.c"
+
+#include "modules_init.h"
+
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#include "snprintf.h"
#endif
-int running_as_daemon = 0;
-
/*
* Here's where it all begins.
*/
{
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;
- const char* basedir;
- char dirbuffer[PATH_MAX]="";
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
+#ifdef HAVE_RUN_DIR
+ struct stat filestats;
+#endif
/* initialize the master context */
InitializeMasterCC();
}
- /* calculate all our path on a central place */
- /* where to keep our config */
-
-#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
- snprintf(SUBDIR,sizeof SUBDIR, "%s%s%s%s%s%s%s", \
- (home&!relh)?ctdl_home_directory:basedir, \
- ((basedir!=ctdldir)&(home&!relh))?basedir:"/", \
- ((basedir!=ctdldir)&(home&!relh))?"/":"", \
- relhome, \
- (relhome[0]!='\0')?"/":"",\
- dirbuffer,\
- (dirbuffer[0]!='\0')?"/":"");
-
-#ifndef HAVE_ETC_DIR
- basedir=ctdldir;
-#else
- basedir=ETC_DIR;
-#endif
- COMPUTE_DIRECTORY(ctdl_etc_dir);
-
-#ifndef HAVE_RUN_DIR
- basedir=ctdldir;
-#else
- basedir=RUN_DIR;
-#endif
- COMPUTE_DIRECTORY(ctdl_run_dir);
-
-#ifndef HAVE_DATA_DIR
- basedir=ctdldir;
-#else
- basedir=DATA_DIR;
-#endif
- COMPUTE_DIRECTORY(ctdl_bio_dir);
- COMPUTE_DIRECTORY(ctdl_bb_dir);
- COMPUTE_DIRECTORY(ctdl_data_dir);
- COMPUTE_DIRECTORY(ctdl_file_dir);
- COMPUTE_DIRECTORY(ctdl_hlp_dir);
- COMPUTE_DIRECTORY(ctdl_image_dir);
- COMPUTE_DIRECTORY(ctdl_info_dir);
- COMPUTE_DIRECTORY(ctdl_message_dir);
- COMPUTE_DIRECTORY(ctdl_usrpic_dir);
-#ifndef HAVE_SPOOL_DIR
- basedir=ctdldir;
-#else
- basedir=SPOOL_DIR;
-#endif
- COMPUTE_DIRECTORY(ctdl_spool_dir);
- COMPUTE_DIRECTORY(ctdl_netout_dir);
- COMPUTE_DIRECTORY(ctdl_netin_dir);
-
+ calc_dirs_n_files(relh, home, relhome, ctdldir);
/* daemonize, if we were asked to */
if (running_as_daemon) {
* 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));
}
"*** 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");
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();
* 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).
*/
lprintf(CTDL_INFO, "Initializing server extensions\n");
size = strlen(ctdl_home_directory) + 9;
+
+/*
initialize_server_extensions();
+*/
+
+ initialise_modules();
+
+
+
+ /*
+ * If we need host auth, start our chkpwd daemon.
+ */
+ if (config.c_auth_mode == 1) {
+ start_chkpwd_daemon();
+ }
/*
* Now that we've bound the sockets, change to the Citadel user id and its
* 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);
}
end_critical_section(S_WORKER_LIST);
- /* Create the indexer thread. */
+ /* Create the maintenance threads. */
create_maintenance_threads();
/* This thread is now useless. It can't be turned into a worker
projects / citadel.git / blobdiff