/*
+ * $Id$
+ *
* citserver's main() function lives here.
+ *
+ * Copyright (c) 1987-2010 by the citadel.org team
*
- * $Id$
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include "database.h"
#include "user_ops.h"
#include "housekeeping.h"
-#include "citadel_dirs.c"
+#include "svn_revision.h"
+#include "citadel_dirs.h"
+
+#include "context.h"
#include "modules_init.h"
#include "ecrash.h"
const char *CitadelServiceTCP="citadel-TCP";
-void go_threading(void);
-/*
- * For the subversion revision number
- */
-const char *svn_revision(void);
+void go_threading(void);
/*
* Here's where it all begins.
int relh=0;
int home=0;
int dbg=0;
+ int have_log=0;
+ int have_minus_x=0;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
#ifdef HAVE_RUN_DIR
eCrashParameters params;
// eCrashSymbolTable symbol_table;
#endif
+
+#ifdef HAVE_GC
+ GC_INIT();
+ GC_find_leak = 1;
+#endif
+
+
/* initialise semaphores here. Patch by Matt and davew
* its called here as they are needed by CtdlLogPrintf for thread safety
*/
running_as_daemon = 1;
}
+ /* run a few stats if -s was specified */
+ else if (!strncmp(argv[a], "-s", 2)) {
+ statcount = atoi(&argv[a][2]);
+ }
+
/* -x specifies the desired logging level */
else if (!strncmp(argv[a], "-x", 2)) {
verbosity = atoi(&argv[a][2]);
+ have_minus_x = 1;
}
else if (!strncmp(argv[a], "-h", 2)) {
else
safestrncpy(relhome, &argv[a][2],
sizeof relhome);
- home_specified = 1;
home=1;
}
else if (!strncmp(argv[a], "-t", 2)) {
- freopen(&argv[a][2], "w", stderr);
+ if (freopen(&argv[a][2], "w", stderr) != stderr)
+ {
+ CtdlLogPrintf(CTDL_EMERG,
+ "unable to open your trace log [%s]: %s",
+ &argv[a][2],
+ strerror(errno));
+ exit(1);
+ }
+ have_log = 1;
}
else if (!strncmp(argv[a], "-D", 2)) {
CtdlLogPrintf(CTDL_EMERG, "citserver: usage: "
"citserver "
"[-lLogFacility] "
- "[-d] [-D] "
+ "[-d] [-D] [-s]"
" [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
}
+ if (have_minus_x && running_as_daemon && have_log)
+ print_to_logfile = 1;
+
calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
/* daemonize, if we were asked to */
if (running_as_daemon) {
CtdlLogPrintf(CTDL_NOTICE, "\n");
CtdlLogPrintf(CTDL_NOTICE, "\n");
CtdlLogPrintf(CTDL_NOTICE,
- "*** Citadel server engine v%d.%02d ***\n",
- (REV_LEVEL/100), (REV_LEVEL%100));
- CtdlLogPrintf(CTDL_NOTICE,
- "*** Build number %s ***\n", svn_revision());
- CtdlLogPrintf(CTDL_NOTICE,
- "Copyright (C) 1987-2008 by the Citadel development team.\n");
- CtdlLogPrintf(CTDL_NOTICE,
- "This program is distributed under the terms of the GNU "
- "General Public License.\n");
+ "*** Citadel server engine v%d.%02d (build %s) ***\n",
+ (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
+ CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2010 by the Citadel development team.\n");
+ CtdlLogPrintf(CTDL_NOTICE, "This program is distributed under the terms of the GNU "
+ "General Public License.\n");
CtdlLogPrintf(CTDL_NOTICE, "\n");
CtdlLogPrintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
CtdlLogPrintf(CTDL_INFO, "%s\n", libcitadel_version_string());
CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
get_config();
config.c_ipgm_secret = rand();
+
+ /* get_control() MUST MUST MUST be called BEFORE the databases are opened!! */
+ CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
+ get_control();
+
put_config();
#ifdef HAVE_RUN_DIR
#else // HAVE_GETPWUID_R
pwp = NULL;
#endif // HAVE_GETPWUID_R
- mkdir(ctdl_run_dir, 0755);
- chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
+
+ if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST))
+ CtdlLogPrintf(CTDL_EMERG,
+ "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)
+ CtdlLogPrintf(CTDL_EMERG,
+ "unable to set the access rights for [%s]: %s",
+ ctdl_run_dir, strerror(errno));
}
*/
master_startup();
- CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
- get_control();
-
+ /*
+ * Check that the control record is correct and place sensible values if it isn't
+ */
+ check_control();
+
+ /*
+ * Run any upgrade entry points
+ */
+ CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
+ upgrade_modules();
+
+/**
+ * Load the user for the masterCC or create them if they don't exist
+ */
+ if (CtdlGetUser(&masterCC.user, "SYS_Citadel"))
+ {
+ /** User doesn't exist. We can't use create user here as the user number needs to be 0 */
+ strcpy (masterCC.user.fullname, "SYS_Citadel") ;
+ CtdlPutUser(&masterCC.user);
+ CtdlGetUser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
+ }
+
/*
* Bind the server to a Unix-domain socket.
*/
CitadelServiceTCP);
- /*
- * Run any upgrade entry points
- */
- CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
- upgrade_modules();
/*
start_chkpwd_daemon();
}
+
+ /*
+ * check, whether we're fired up another time after a crash.
+ * if, post an aide message, so the admin has a chance to react.
+ */
+ checkcrash ();
+
+
/*
* Now that we've bound the sockets, change to the Citadel user id and its
* corresponding group ids
projects / citadel.git / blobdiff