open_databases();
/* Load site-specific configuration */
- syslog(LOG_INFO, "Loading citadel.config");
+ syslog(LOG_INFO, "Initializing configuration system");
initialize_config_system();
validate_config();
-
- syslog(LOG_INFO, "Acquiring control record");
- get_control();
+ migrate_legacy_control_record();
/* Check floor reference counts */
check_ref_counts();
}
}
- release_control();
-
/* Now go away. */
syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode);
fflush(stdout); fflush(stderr);
}
-
-
-/*
- * This loop recognizes all server commands.
- */
-void do_command_loop(void) {
- char cmdbuf[SIZ];
-
- 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;
- return;
- }
-
- /* Log the server command, but don't show passwords... */
- if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) {
- syslog(LOG_INFO, "[%d][%s(%ld)] %s",
- CC->cs_pid, CC->curr_user, CC->user.usernum, cmdbuf
- );
- }
- else {
- syslog(LOG_INFO, "[%d][%s(%ld)] <password command hidden from log>",
- CC->cs_pid, CC->curr_user, CC->user.usernum
- );
- }
-
- buffer_output();
-
- /*
- * Let other clients see the last command we executed, and
- * update the idle time, but not NOOP, QNOP, PEXP, GEXP, RWHO, or TIME.
- */
- if ( (strncasecmp(cmdbuf, "NOOP", 4))
- && (strncasecmp(cmdbuf, "QNOP", 4))
- && (strncasecmp(cmdbuf, "PEXP", 4))
- && (strncasecmp(cmdbuf, "GEXP", 4))
- && (strncasecmp(cmdbuf, "RWHO", 4))
- && (strncasecmp(cmdbuf, "TIME", 4)) ) {
- strcpy(CC->lastcmdname, " ");
- safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname));
- time(&CC->lastidle);
- }
-
- if ((strncasecmp(cmdbuf, "ENT0", 4))
- && (strncasecmp(cmdbuf, "MESG", 4))
- && (strncasecmp(cmdbuf, "MSGS", 4)))
- {
- CC->cs_flags &= ~CS_POSTING;
- }
-
- if (!DLoader_Exec_Cmd(cmdbuf)) {
- cprintf("%d Unrecognized or unsupported command.\n", ERROR + CMD_NOT_SUPPORTED);
- }
-
- unbuffer_output();
-
- /* Run any after-each-command routines registered by modules */
- PerformSessionHooks(EVT_CMD);
-}
-
-
/*
* This loop performs all asynchronous functions.
*/