X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=f389ac9f020b303551e62769d12c4d9135ea9b6c;hb=e6499f44a49d449e41ba605a0c7476019da432b4;hp=4a1070b23563876a03ca5b84c10951497888665f;hpb=4db4fc48793f3680c5defd28ea32c97044a2b569;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index 4a1070b23..f389ac9f0 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,7 +1,7 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2014 by the citadel.org team + * Copyright (c) 1987-2015 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. @@ -122,11 +122,9 @@ void master_startup(void) { syslog(LOG_DEBUG, "master_startup() started\n"); time(&server_startup_time); - get_config(); - validate_config(); syslog(LOG_INFO, "Checking directory access"); - if ((pw = getpwuid(CTDLUID)) == NULL) { + if ((pw = getpwuid(ctdluid)) == NULL) { gid = getgid(); } else { gid = pw->pw_gid; @@ -138,13 +136,21 @@ void master_startup(void) { } syslog(LOG_INFO, "Opening databases"); open_databases(); + + /* Load site-specific configuration */ + syslog(LOG_INFO, "Initializing configuration system"); + initialize_config_system(); + validate_config(); + migrate_legacy_control_record(); + + /* Check floor reference counts */ check_ref_counts(); syslog(LOG_INFO, "Creating base rooms (if necessary)\n"); - CtdlCreateRoom(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); - CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); - CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); - CtdlCreateRoom(config.c_twitroom, 0, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(CtdlGetConfigStr("c_baseroom"), 0, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(CtdlGetConfigStr("c_twitroom"), 0, "", 0, 1, 0, VIEW_BBS); /* The "Local System Configuration" room doesn't need to be visible */ if (CtdlGetRoomLock(&qrbuf, SYSCONFIGROOM) == 0) { @@ -174,16 +180,14 @@ void master_startup(void) { srand(seed); srandom(seed); - put_config(); - syslog(LOG_DEBUG, "master_startup() finished\n"); } /* - * Cleanup routine to be called when the server is shutting down. + * Cleanup routine to be called when the server is shutting down. Returns the needed exit code. */ -void master_cleanup(int exitcode) { +int master_cleanup(int exitcode) { struct CleanupFunctionHook *fcn; static int already_cleaning_up = 0; @@ -200,6 +204,9 @@ void master_cleanup(int exitcode) { /* Do system-dependent stuff */ sysdep_master_cleanup(); + + /* Close the configuration system */ + shutdown_config_system(); /* Close databases */ syslog(LOG_INFO, "Closing databases\n"); @@ -214,17 +221,17 @@ void master_cleanup(int exitcode) { } } - release_control(); - /* Now go away. */ syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode); fflush(stdout); fflush(stderr); - if (restart_server != 0) - exit(1); - if ((running_as_daemon != 0) && ((exitcode == 0) )) + if (restart_server != 0) { + exitcode = 1; + } + else if ((running_as_daemon != 0) && ((exitcode == 0) )) { exitcode = CTDLEXIT_SHUTDOWN; - exit(exitcode); + } + return(exitcode); } @@ -289,7 +296,7 @@ int CtdlIsPublicClient(void) safestrncpy(public_clientspos, LOCALHOSTSTR, sizeof public_clients); public_clientspos += sizeof(LOCALHOSTSTR) - 1; - if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) { + if (hostname_to_dotted_quad(addrbuf, CtdlGetConfigStr("c_fqdn")) == 0) { *(public_clientspos++) = '|'; paddr = &addrbuf[0]; while (!IsEmptyStr (paddr) && @@ -351,12 +358,12 @@ 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, - config.c_nodename, config.c_maxsessions + CtdlGetConfigStr("c_nodename"), CtdlGetConfigInt("c_maxsessions") ); CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED; } else { - cprintf("%d %s Citadel server ready.\n", CIT_OK, config.c_nodename); + cprintf("%d %s Citadel server ready.\n", CIT_OK, CtdlGetConfigStr("c_nodename")); CC->can_receive_im = 1; } } @@ -364,70 +371,7 @@ void citproto_begin_session() { void citproto_begin_admin_session() { CC->internal_pgm = 1; - cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, config.c_nodename); -} - - - - -/* - * 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)]