/*
* Main source module for the Citadel server
*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2014 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_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;
}
syslog(LOG_INFO, "Opening databases");
open_databases();
-
- /* Load site-specific configuration */
- syslog(LOG_INFO, "Loading citadel.config");
- get_config();
- validate_config();
-
- syslog(LOG_INFO, "Acquiring control record");
- get_control();
- put_config();
-
- /* Check floor reference counts */
check_ref_counts();
syslog(LOG_INFO, "Creating base rooms (if necessary)\n");