/*
* Main source module for the Citadel server
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2020 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.
validate_config();
migrate_legacy_control_record();
+ // If we have an existing database that is older than version 928, reindex the user records.
+ // Unfortunately we cannot do this in serv_upgrade.c because it needs to happen VERY early during startup.
+ int existing_db = CtdlGetConfigInt("MM_hosted_upgrade_level");
+ if ( (existing_db > 0) && (existing_db < 928) ) {
+ ForEachUser(reindex_user_928, NULL);
+ }
+
/* Check floor reference counts */
check_ref_counts();
struct CleanupFunctionHook *fcn;
static int already_cleaning_up = 0;
- if (already_cleaning_up)
- while (1)
+ if (already_cleaning_up) {
+ while (1) {
usleep(1000000);
+ }
+ }
already_cleaning_up = 1;
/* Run any cleanup routines registered by loadable modules */
(*fcn->h_function_pointer) ();
}
- /* Close the AdjRefCount queue file */
- AdjRefCount(-1, 0);
-
/* Do system-dependent stuff */
sysdep_master_cleanup();
}
-
/*
* returns an asterisk if there are any instant messages waiting,
* space otherwise.
}
-/*
- * Check originating host against the public_clients file. This determines
- * whether the client is allowed to change the hostname for this session
- * (for example, to show the location of the user rather than the location
- * of the client).
- */
-int CtdlIsPublicClient(void)
-{
- char buf[1024];
- char addrbuf[1024];
- FILE *fp;
- int i;
- char *public_clientspos;
- char *public_clientsend;
- char *paddr = NULL;
- struct stat statbuf;
- static time_t pc_timestamp = 0;
- static char public_clients[SIZ];
- static char public_clients_file[SIZ];
-
-#define LOCALHOSTSTR "127.0.0.1"
-
- snprintf(public_clients_file, sizeof public_clients_file, "%s/public_clients", ctdl_etc_dir);
-
- /*
- * Check the time stamp on the public_clients file. If it's been
- * updated since the last time we were here (or if this is the first
- * time we've been through the loop), read its contents and learn
- * the IP addresses of the listed hosts.
- */
- if (stat(public_clients_file, &statbuf) != 0) {
- /* No public_clients file exists, so bail out */
- syslog(LOG_WARNING, "Warning: '%s' does not exist", public_clients_file);
- return (0);
- }
-
- if (statbuf.st_mtime > pc_timestamp) {
- begin_critical_section(S_PUBLIC_CLIENTS);
- syslog(LOG_INFO, "Loading %s", public_clients_file);
-
- public_clientspos = &public_clients[0];
- public_clientsend = public_clientspos + SIZ;
- safestrncpy(public_clientspos, LOCALHOSTSTR, sizeof public_clients);
- public_clientspos += sizeof(LOCALHOSTSTR) - 1;
-
- if (hostname_to_dotted_quad(addrbuf, CtdlGetConfigStr("c_fqdn")) == 0) {
- *(public_clientspos++) = '|';
- paddr = &addrbuf[0];
- while (!IsEmptyStr(paddr) && (public_clientspos < public_clientsend))
- *(public_clientspos++) = *(paddr++);
- }
-
- fp = fopen(public_clients_file, "r");
- if (fp != NULL)
- while ((fgets(buf, sizeof buf, fp) != NULL) && (public_clientspos < public_clientsend)) {
- char *ptr;
- ptr = buf;
- while (!IsEmptyStr(ptr)) {
- if (*ptr == '#') {
- *ptr = 0;
- break;
- } else
- ptr++;
- }
- ptr--;
- while (ptr > buf && isspace(*ptr)) {
- *(ptr--) = 0;
- }
- if (hostname_to_dotted_quad(addrbuf, buf) == 0) {
- *(public_clientspos++) = '|';
- paddr = addrbuf;
- while (!IsEmptyStr(paddr) && (public_clientspos < public_clientsend)) {
- *(public_clientspos++) = *(paddr++);
- }
- }
- }
- if (fp != NULL)
- fclose(fp);
- pc_timestamp = time(NULL);
- end_critical_section(S_PUBLIC_CLIENTS);
- }
-
- syslog(LOG_DEBUG, "Checking whether %s is a local or public client", CC->cs_addr);
- 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 its local.");
- return (1);
- }
- }
-
- /* No hits. This is not a public client. */
- syslog(LOG_DEBUG, "... no it isn't.");
- return (0);
-}
-
-
-
-
-
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"));
}
projects / citadel.git / blobdiff