X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=2d2309b09407bec9213a19b973a0376bdba84f40;hb=01cc19a4c2da27b4db0e980ccd3ca54d834319c8;hp=3c610aba915ae23e95de5a140df1216becc5f86d;hpb=9a7a7863409fb96e229a93471ec75346c472645d;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 3c610aba9..2d2309b09 100644
--- 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,15 @@
 #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>
@@ -71,21 +78,26 @@ 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();
 
-	/* set default syslog facility */
-	syslog_facility = LOG_DAEMON;
-
 	/* parse command-line arguments */
 	for (a=1; a<argc; ++a) {
 
 		if (!strncmp(argv[a], "-l", 2)) {
-			safestrncpy(facility, argv[a], sizeof(facility));
+			safestrncpy(facility, &argv[a][2], sizeof(facility));
 			syslog_facility = SyslogFacility(facility);
 			enable_syslog = 1;
 		}
@@ -101,9 +113,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)) {
@@ -133,21 +150,21 @@ 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);
 		drop_root_perms = 1;
 	}
 
-	/* initialize the syslog facility */
+	/* Initialize the syslogger.  Yes, we are really using 0 as the
+	 * facility, because we are going to bitwise-OR the facility to
+	 * the severity of each message, allowing us to write to other
+	 * facilities when we need to...
+	 */
 	if (enable_syslog) {
-		if (running_as_daemon) {
-			openlog("citadel", LOG_NDELAY, syslog_facility);
-		}
-		else {
-			openlog("citadel", LOG_PERROR|LOG_NDELAY,
-				syslog_facility);
-		}
+		openlog("citadel", LOG_NDELAY, 0);
 		setlogmask(LOG_UPTO(verbosity));
 	}
 	
@@ -158,7 +175,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 +188,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,10 +219,10 @@ int main(int argc, char **argv)
 	 * Bind the server to a Unix-domain socket.
 	 */
 	CtdlRegisterServiceHook(0,
-				"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).
@@ -202,21 +238,42 @@ int main(int argc, char **argv)
 	 */
 	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);
@@ -243,7 +300,7 @@ int main(int argc, char **argv)
 	end_critical_section(S_WORKER_LIST);
 
 	/* Create the indexer thread. */
-	create_indexer_thread();
+	create_maintenance_threads();
 
 	/* This thread is now useless.  It can't be turned into a worker
 	 * thread because its stack is too small, but it can't be killed