From: Art Cancro Date: Wed, 21 Aug 2019 21:42:00 +0000 (-0400) Subject: Removed all of the SYS_ user contexts, they aren't needed anymore X-Git-Tag: v939~272 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c71df26b9d35c07eb9c1322a7e83caa86337ad82 Removed all of the SYS_ user contexts, they aren't needed anymore --- diff --git a/citadel/euidindex.c b/citadel/euidindex.c index edff5d7c6..8533caabf 100644 --- a/citadel/euidindex.c +++ b/citadel/euidindex.c @@ -1,7 +1,7 @@ /* * Index messages by EUID per room. * - * Copyright (c) 1987-2017 by the citadel.org team + * Copyright (c) 1987-2019 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. @@ -106,7 +106,7 @@ void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum) { char *data; int data_len; - syslog(LOG_DEBUG, "euidindex: ndexing message #%ld <%s> in <%s>", msgnum, euid, qrbuf->QRname); + syslog(LOG_DEBUG, "euidindex: indexing message #%ld <%s> in <%s>", msgnum, euid, qrbuf->QRname); key_len = strlen(euid) + sizeof(long) + 1; key = malloc(key_len); diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index a06459ed2..1f610f258 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -1,7 +1,7 @@ /* * This module handles network mail and mailing list processing. * - * Copyright (c) 2000-2018 by the citadel.org team + * Copyright (c) 2000-2019 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. @@ -77,8 +77,6 @@ #include "netspool.h" #include "netmail.h" -struct CitContext networker_spool_CC; - /* comes from lookup3.c from libcitadel... */ extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); @@ -227,7 +225,6 @@ void network_do_queue(void) syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)); } - become_session(&networker_spool_CC); begin_critical_section(S_RPLIST); RL.rplist = rplist; rplist = NULL; @@ -320,13 +317,10 @@ void network_do_queue(void) /* * Module entry point */ - - CTDL_MODULE_INIT(network) { if (!threading) { - CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool"); CtdlRegisterRoomHook(network_room_handler); CtdlRegisterCleanupHook(destroy_network_queue_room_locked); CtdlRegisterSessionHook(network_do_queue, EVT_TIMER, PRIO_QUEUE + 10); diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c index ab2c4a6cd..51d3f2dd9 100644 --- a/citadel/modules/pop3client/serv_pop3client.c +++ b/citadel/modules/pop3client/serv_pop3client.c @@ -1,7 +1,7 @@ /* * Consolidate mail from remote POP3 accounts. * - * Copyright (c) 2007-2017 by the citadel.org team + * Copyright (c) 2007-2019 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 as published @@ -59,7 +59,6 @@ struct p3cq { // module-local queue of pop3 client work that needs processing long interval; }; -struct CitContext pop3_client_CC; static int doing_pop3client = 0; struct p3cq *p3cq = NULL; @@ -204,8 +203,6 @@ void pop3client_scan(void) { time_t fastest_scan; struct p3cq *pptr = NULL; - become_session(&pop3_client_CC); - if (CtdlGetConfigLong("c_pop3_fastest") < CtdlGetConfigLong("c_pop3_fetch")) { fastest_scan = CtdlGetConfigLong("c_pop3_fastest"); } @@ -259,7 +256,6 @@ CTDL_MODULE_INIT(pop3client) { if (!threading) { - CtdlFillSystemContext(&pop3_client_CC, "POP3aggr"); CtdlREGISTERRoomCfgType(pop3client, ParseGeneric, 0, 5, SerializeGeneric, DeleteGenericCfgLine); CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER, PRIO_AGGR + 50); } diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index 250e1ecdd..11ffb905f 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -73,7 +73,6 @@ struct rssparser { }; time_t last_run = 0L; -struct CitContext rss_CC; struct rssurl *rsstodo = NULL; @@ -446,7 +445,6 @@ void rssclient_scan(void) { return; } - become_session(&rss_CC); syslog(LOG_DEBUG, "rssclient: started"); CtdlForEachRoom(rssclient_scan_room, NULL); rss_pull_feeds(); @@ -463,10 +461,6 @@ CTDL_MODULE_INIT(rssclient) syslog(LOG_INFO, "rssclient: using %s", curl_version()); CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300); } - else - { - CtdlFillSystemContext(&rss_CC, "rssclient"); - } return "rssclient"; } diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c index 9e1226ac8..1b7595df0 100644 --- a/citadel/modules/smtp/serv_smtpclient.c +++ b/citadel/modules/smtp/serv_smtpclient.c @@ -58,7 +58,6 @@ struct smtpmsgsrc { // Data passed in and out of libcurl for message upload int bytes_sent; }; -struct CitContext smtp_client_CC; static int doing_smtpclient = 0; long *smtpq = NULL; // array of msgnums containing queue instructions int smtpq_count = 0; // number of queue messages in smtpq @@ -555,7 +554,6 @@ void smtp_do_queue(void) doing_smtpclient = 1; syslog(LOG_DEBUG, "smtpclient: start queue run"); - pthread_setspecific(MyConKey, (void *) &smtp_client_CC); if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) { syslog(LOG_WARNING, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM); @@ -582,7 +580,6 @@ void smtp_do_queue(void) CTDL_MODULE_INIT(smtpclient) { if (!threading) { - CtdlFillSystemContext(&smtp_client_CC, "SMTP_Send"); CtdlRegisterMessageHook(smtp_aftersave, EVT_AFTERSAVE); CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER, PRIO_AGGR + 50); smtp_init_spoolout(); diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c index 1cbc77741..b0e827455 100644 --- a/citadel/utils/setup.c +++ b/citadel/utils/setup.c @@ -128,7 +128,6 @@ void SetTitles(void) "specify the -h flag to the server when you start it up.\n" "note that it may not have a leading /"); - setup_titles[eSysAdminName] = _("Citadel administrator username:"); setup_text[eSysAdminName] = _( "Please enter the name of the Citadel user account that should be granted " @@ -136,7 +135,6 @@ void SetTitles(void) "this user account will be created if it does not exist. For external " "authentication this user account has to exist."); - setup_titles[eSysAdminPW] = _("Administrator password:"); setup_text[eSysAdminPW] = _( "Enter a password for the system administrator. When setup\n"