/*
* Main source module for the Citadel server
*
- * Copyright (c) 1987-2019 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
syslog(LOG_INFO, "Checking directory access");
if ((pw = getpwuid(ctdluid)) == NULL) {
gid = getgid();
- } else {
+ }
+ else {
gid = pw->pw_gid;
}
if (create_run_directories(CTDLUID, gid) != 0) {
- syslog(LOG_EMERG, "failed to access & create directories");
+ syslog(LOG_ERR, "citserver: failed to access and create directories");
exit(1);
}
syslog(LOG_INFO, "Opening databases");
*/
int master_cleanup(int exitcode)
{
- struct CleanupFunctionHook *fcn;
static int already_cleaning_up = 0;
if (already_cleaning_up) {
}
already_cleaning_up = 1;
- /* Run any cleanup routines registered by loadable modules */
- for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
- (*fcn->h_function_pointer) ();
- }
-
/* Do system-dependent stuff */
sysdep_master_cleanup();
shutdown_config_system();
/* Close databases */
- syslog(LOG_INFO, "Closing databases\n");
+ syslog(LOG_INFO, "citserver: closing databases");
close_databases();
/* If the operator requested a halt but not an exit, halt here. */
void citproto_begin_session()
{
if (CC->nologin == 1) {
- cprintf("%d %s: Too many users are already online (maximum is %d)\n",
- ERROR + MAX_SESSIONS_EXCEEDED, CtdlGetConfigStr("c_nodename"), CtdlGetConfigInt("c_maxsessions")
+ cprintf("%d Too many users are already online (maximum is %d)\n",
+ ERROR + MAX_SESSIONS_EXCEEDED, CtdlGetConfigInt("c_maxsessions")
);
CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED;
} else {
- cprintf("%d %s Citadel server ready.\n", CIT_OK, CtdlGetConfigStr("c_nodename"));
+ cprintf("%d %s Citadel server ready.\n", CIT_OK, CtdlGetConfigStr("c_fqdn"));
CC->can_receive_im = 1;
}
}
void citproto_begin_admin_session()
{
CC->internal_pgm = 1;
- cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, CtdlGetConfigStr("c_nodename"));
+ cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, CtdlGetConfigStr("c_fqdn"));
}