X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=45312588ee614e90f17c836fd2b05e95f7c5578c;hb=cdb873062246d255bb3813d4443bcaa0992e03ff;hp=054c8054752fbf116894e44fa2936f9f2cdcde53;hpb=dde28286731b04ee75cc717d3297ed005f9831f5;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 054c80547..45312588e 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2013 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -26,6 +26,7 @@
 #include "user_ops.h"
 #include "ecrash.h"
 
+uid_t ctdluid = 0;
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
@@ -51,6 +52,8 @@ int main(int argc, char **argv)
 	char ctdldir[PATH_MAX]=CTDLDIR;
 	int syslog_facility = LOG_DAEMON;
 	const char *eDebuglist[] = {NULL, NULL};
+	uid_t u = 0;
+	struct passwd *p = NULL;
 #ifdef HAVE_RUN_DIR
 	struct stat filestats;
 #endif
@@ -64,7 +67,7 @@ int main(int argc, char **argv)
 	InitializeMasterTSD();
 
 	/* parse command-line arguments */
-	while ((a=getopt(argc, argv, "l:dh:x:t:B:Dr")) != EOF) switch(a) {
+	while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:")) != EOF) switch(a) {
 
 		case 'l':
 			safestrncpy(facility, optarg, sizeof(facility));
@@ -108,16 +111,57 @@ int main(int argc, char **argv)
 			drop_root_perms = 0;
 			break;
 
+		/* -u tells the server what uid to run under... */
+		case 'u':
+			u = atoi(optarg);
+			if (u > 0) {
+				ctdluid = u;
+			}
+			else {
+				p = getpwnam(optarg);
+				if (p) {
+					u = p->pw_uid;
+				}
+			}
+			if (u > 0) {
+				ctdluid = u;
+			}
+			break;
+
 		default:
 		/* any other parameter makes it crash and burn */
 			fprintf(stderr,	"citserver: usage: "
 					"citserver "
 					"[-l LogFacility] "
 					"[-d] [-D] [-r] "
+					"[-u user] "
 					"[-h HomeDir]\n"
 			);
 			exit(1);
 	}
+
+	/* Last ditch effort to determine the user name ... if there's a user called "citadel" then use that */
+	if (ctdluid == 0) {
+		p = getpwnam("citadel");
+		if (!p) {
+			p = getpwnam("bbs");
+		}
+		if (!p) {
+			p = getpwnam("guest");
+		}
+		if (p) {
+			u = p->pw_uid;
+		}
+		if (u > 0) {
+			ctdluid = u;
+		}
+	}
+
+	if ((ctdluid == 0) && (drop_root_perms == 0)) {
+		fprintf(stderr, "citserver: cannot determine user to run as; please specify -r or -u options\n");
+		exit(CTDLEXIT_UNUSER);
+	}
+
 	StartLibCitadel(basesize);
 	openlog("citserver",
 		( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
@@ -131,7 +175,8 @@ int main(int argc, char **argv)
 		drop_root_perms = 1;
 	}
 
-#ifdef HAVE_BACKTRACE
+#if 0
+ def HAVE_BACKTRACE
 	bzero(&params, sizeof(params));
 	params.filename = file_pid_paniclog;
 	panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
@@ -150,35 +195,24 @@ int main(int argc, char **argv)
 	/* Tell 'em who's in da house */
 	syslog(LOG_NOTICE, " ");
 	syslog(LOG_NOTICE, " ");
-	syslog(LOG_NOTICE,
-		"*** Citadel server engine v%d.%02d (build %s) ***",
-		(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-	syslog(LOG_NOTICE, "Copyright (C) 1987-2013 by the Citadel development team.");
+	syslog(LOG_NOTICE, "*** Citadel server engine ***\n");
+ 	syslog(LOG_NOTICE, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
+	syslog(LOG_NOTICE, "Copyright (C) 1987-2016 by the Citadel development team.");
 	syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
 					"General Public License.");
 	syslog(LOG_NOTICE, " ");
 	syslog(LOG_DEBUG, "Called as: %s", argv[0]);
 	syslog(LOG_INFO, "%s", libcitadel_version_string());
 
-	/* Load site-specific configuration */
-	syslog(LOG_INFO, "Loading citadel.config");
-	get_config();
-
-	/* get_control() MUST MUST MUST be called BEFORE the databases are opened!! */
-	syslog(LOG_INFO, "Acquiring control record");
-	get_control();
-
-	put_config();
-
 #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 HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
-		pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+		pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
 #else // SOLARIS_GETPWUID
-		getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+		getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
 #endif // SOLARIS_GETPWUID
 #else // HAVE_GETPWUID_R
 		pwp = NULL;
@@ -189,7 +223,7 @@ int main(int argc, char **argv)
 				      "unable to create run directory [%s]: %s", 
 				      ctdl_run_dir, strerror(errno));
 
-		if (chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0)
+		if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0)
 			syslog(LOG_EMERG, 
 				      "unable to set the access rights for [%s]: %s", 
 				      ctdl_run_dir, strerror(errno));
@@ -252,7 +286,7 @@ int main(int argc, char **argv)
 	/*
 	 * Bind the server to our favorite TCP port (usually 504).
 	 */
-	CtdlRegisterServiceHook(config.c_port_number,
+	CtdlRegisterServiceHook(CtdlGetConfigInt("c_port_number"),
 				NULL,
 				citproto_begin_session,
 				do_command_loop,
@@ -275,7 +309,7 @@ int main(int argc, char **argv)
 	/*
 	 * If we need host auth, start our chkpwd daemon.
 	 */
-	if (config.c_auth_mode == AUTHMODE_HOST) {
+	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 		start_chkpwd_daemon();
 	}
 
@@ -296,9 +330,9 @@ int main(int argc, char **argv)
 
 #ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
-		pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+		pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
 #else // SOLARIS_GETPWUID
-		getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+		getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
 #endif // SOLARIS_GETPWUID
 #else // HAVE_GETPWUID_R
 		pwp = NULL;