syslog(LOG_DEBUG, "master_startup() started\n");
time(&server_startup_time);
+ get_config();
syslog(LOG_INFO, "Opening databases\n");
open_databases();
-
- ctdl_thread_internal_init_tsd();
-
- CtdlThreadAllocTSD();
-
check_ref_counts();
syslog(LOG_INFO, "Creating base rooms (if necessary)\n");
urandom = fopen("/dev/urandom", "r");
if (urandom != NULL) {
rv = fread(&seed, sizeof seed, 1, urandom);
+ if (rv == -1)
+ syslog(LOG_EMERG, "failed to read random seed: %s\n",
+ strerror(errno));
fclose(urandom);
}
else {
srand(seed);
srandom(seed);
- syslog(LOG_INFO, "Initializing ipgm secret\n");
- get_config();
- config.c_ipgm_secret = rand();
put_config();
syslog(LOG_DEBUG, "master_startup() finished\n");
struct CleanupFunctionHook *fcn;
static int already_cleaning_up = 0;
- if (already_cleaning_up) while(1) sleep(1);
+ if (already_cleaning_up) while(1) usleep(1000);
already_cleaning_up = 1;
/* Run any cleanup routines registered by loadable modules */
cprintf("%s\n", config.c_default_cal_zone);
- /* Output load averages */
- cprintf("%f\n", CtdlThreadLoadAvg);
- cprintf("%f\n", CtdlThreadWorkerAvg);
- cprintf("%d\n", CtdlThreadGetCount());
+ /* thread load averages -- temporarily disabled during refactoring of this code */
+ cprintf("0\n"); /* load average */
+ cprintf("0\n"); /* worker average */
+ cprintf("0\n"); /* thread count */
cprintf("1\n"); /* yes, Sieve mail filtering is supported */
cprintf("%d\n", config.c_enable_fulltext);
/* timezone and daylight global variables are not portable. */
#ifdef HAVE_STRUCT_TM_TM_GMTOFF
- cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst);
+ cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst, server_startup_time);
#else
- cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst);
+ cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst, server_startup_time);
#endif
}
for (i=0; i<num_parms(public_clients); ++i) {
extract_token(addrbuf, public_clients, i, '|', sizeof addrbuf);
if (!strcasecmp(CC->cs_addr, addrbuf)) {
- syslog(LOG_DEBUG, "... yes it is.\n");
+ syslog(LOG_DEBUG, "... yes its local.\n");
return(1);
}
}
if (viewed->room.QRflags & QR_PRIVATE) {
CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL);
if ( (ra & UA_KNOWN) == 0) {
- strcpy(real_room, "<private room>");
+ strcpy(real_room, " ");
}
}
}
-/*
- * Perform privilege escalation for an internal program
- */
-void cmd_ipgm(char *argbuf)
-{
- int secret;
-
- secret = extract_int(argbuf, 0);
-
- /* For security reasons, we do NOT allow this command to run
- * over the network. Local sockets only.
- */
- if (!CC->is_local_socket) {
- sleep(5);
- cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED);
- }
- else if (secret == config.c_ipgm_secret) {
- CC->internal_pgm = 1;
- strcpy(CC->curr_user, "<internal program>");
- CC->cs_flags = CC->cs_flags|CS_STEALTH;
- cprintf("%d Authenticated as an internal program.\n", CIT_OK);
- }
- else {
- sleep(5);
- cprintf("%d Authentication failed.\n", ERROR + PASSWORD_REQUIRED);
- syslog(LOG_ERR, "Warning: ipgm authentication failed.\n");
- CC->kill_me = KILLME_AUTHFAILED;
- }
-}
-
/*
* Shut down the server
cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN);
}
CC->kill_me = KILLME_SERVER_SHUTTING_DOWN;
- CtdlThreadStopAll();
+ server_shutting_down = 1;
}
if (CtdlAccessCheck(ac_aide)) return;
cprintf("%d Halting server. Goodbye.\n", CIT_OK);
- CtdlThreadStopAll();
+ server_shutting_down = 1;
shutdown_and_halt = 1;
}
*/
void begin_session(CitContext *con)
{
- socklen_t len;
- struct sockaddr_in sin;
-
/*
* Initialize some variables specific to our context.
*/
safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
con->cs_UDSclientUID = -1;
con->cs_host[sizeof con->cs_host - 1] = 0;
- len = sizeof sin;
if (!CC->is_local_socket) {
locate_host(con->cs_host, sizeof con->cs_host,
con->cs_addr, sizeof con->cs_addr,
}
+void citproto_begin_admin_session() {
+ CC->internal_pgm = 1;
+ cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, config.c_nodename);
+}
+
+
void cmd_noop(char *argbuf)
{
cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() );
*/
void do_command_loop(void) {
char cmdbuf[SIZ];
- const char *old_name = NULL;
-
- old_name = CtdlThreadName("do_command_loop");
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
syslog(LOG_ERR, "Citadel client disconnected: ending session.\n");
CC->kill_me = KILLME_CLIENT_DISCONNECTED;
- CtdlThreadName(old_name);
return;
}
/* Log the server command, but don't show passwords... */
if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) {
- syslog(LOG_INFO, "CtdlCommand [%s] [%s] %s\n", CTDLUSERIP, CC->curr_user, cmdbuf);
+ syslog(LOG_INFO, "[%d][%s(%ld)] %s",
+ CC->cs_pid, CC->curr_user, CC->user.usernum, cmdbuf
+ );
}
else {
- syslog(LOG_INFO, "CtdlCommand [%s] [%s] <password command hidden from log>\n", CTDLUSERIP, CC->curr_user);
+ syslog(LOG_INFO, "[%d][%s(%ld)] <password command hidden from log>",
+ CC->cs_pid, CC->curr_user, CC->user.usernum
+ );
}
buffer_output();
time(&CC->lastidle);
}
- CtdlThreadName(cmdbuf);
-
if ((strncasecmp(cmdbuf, "ENT0", 4))
&& (strncasecmp(cmdbuf, "MESG", 4))
&& (strncasecmp(cmdbuf, "MSGS", 4)))
/* Run any after-each-command routines registered by modules */
PerformSessionHooks(EVT_CMD);
- CtdlThreadName(old_name);
}
CtdlRegisterProtoHook(cmd_echo, "ECHO", "echo text back to the client");
CtdlRegisterProtoHook(cmd_more, "MORE", "fetch the paginator prompt");
CtdlRegisterProtoHook(cmd_iden, "IDEN", "identify the client software and location");
- CtdlRegisterProtoHook(cmd_ipgm, "IPGM", "perform privilege escalation for internal programs");
CtdlRegisterProtoHook(cmd_term, "TERM", "terminate another running session");
CtdlRegisterProtoHook(cmd_down, "DOWN", "perform a server shutdown");
CtdlRegisterProtoHook(cmd_halt, "HALT", "halt the server without exiting the server process");