X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontrol.c;h=a99bbf6f67f56d671539926c7b1b0ffae247a715;hb=373b01806f2c2949b86b0ef83b28e15d38af5ee6;hp=f541f982ddbc5ba9ef5eaac33b762da1ec093c7b;hpb=fbfd4f7c2a258c74f05d9a9a63eeb83273b101da;p=citadel.git diff --git a/citadel/control.c b/citadel/control.c index f541f982d..a99bbf6f6 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -1,7 +1,7 @@ /* * This module handles states which are global to the entire server. * - * Copyright (c) 1987-2017 by the citadel.org team + * Copyright (c) 1987-2021 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. @@ -42,6 +42,11 @@ struct legacy_ctrl_format { /* * Callback to get highest room number when rebuilding message base metadata + * + * sanity_diag_mode (can be set by -s flag at startup) may be: + * 0 = attempt to fix inconsistencies + * 1 = show inconsistencies but don't repair them, exit after complete + * 2 = show inconsistencies but don't repair them, continue execution */ void control_find_highest(struct ctdlroom *qrbuf, void *data) { @@ -50,16 +55,17 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data) long *msglist; int num_msgs=0; int c; - int room_fixed = 0; - int message_fixed = 0; - if (qrbuf->QRnumber > CtdlGetConfigLong("MMnextroom")) - { - CtdlSetConfigLong("MMnextroom", qrbuf->QRnumber); - room_fixed = 1; + if (qrbuf->QRnumber > CtdlGetConfigLong("MMnextroom")) { + syslog(LOG_DEBUG, "control: fixing MMnextroom %ld > %ld , found in %s", + qrbuf->QRnumber, CtdlGetConfigLong("MMnextroom"), qrbuf->QRname + ); + if (!sanity_diag_mode) { + CtdlSetConfigLong("MMnextroom", qrbuf->QRnumber); + } } - CtdlGetRoom (&room, qrbuf->QRname); + CtdlGetRoom(&room, qrbuf->QRname); /* Load the message list */ cdbfr = cdb_fetch(CDB_MSGLISTS, &room.QRnumber, sizeof(long)); @@ -70,24 +76,19 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data) return; /* No messages at all? No further action. */ } - if (num_msgs>0) - { - for (c=0; c CtdlGetConfigLong("MMhighest")) - { - CtdlSetConfigLong("MMhighest", msglist[c]); - message_fixed = 1; + if (num_msgs > 0) { + for (c=0; c CtdlGetConfigLong("MMhighest")) { + syslog(LOG_DEBUG, "control: fixing MMhighest %ld > %ld , found in %s", + msglist[c], CtdlGetConfigLong("MMhighest"), qrbuf->QRname + ); + if (!sanity_diag_mode) { + CtdlSetConfigLong("MMhighest", msglist[c]); + } } } } cdb_free(cdbfr); - if (room_fixed) { - syslog(LOG_INFO, "control: fixed room counter"); - } - if (message_fixed) { - syslog(LOG_INFO, "control: fixed message count"); - } return; } @@ -95,18 +96,21 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data) /* * Callback to get highest user number. */ - -void control_find_user (struct ctdluser *EachUser, void *out_data) -{ - int user_fixed = 0; - - if (EachUser->usernum > CtdlGetConfigLong("MMnextuser")) - { - CtdlSetConfigLong("MMnextuser", EachUser->usernum); - user_fixed = 1; +void control_find_user(char *username, void *out_data) { + struct ctdluser EachUser; + + if (CtdlGetUser(&EachUser, username) != 0) { + return; + } + + if (EachUser.usernum > CtdlGetConfigLong("MMnextuser")) { + syslog(LOG_DEBUG, "control: fixing MMnextuser %ld > %ld , found in %s", + EachUser.usernum, CtdlGetConfigLong("MMnextuser"), EachUser.fullname + ); + if (!sanity_diag_mode) { + CtdlSetConfigLong("MMnextuser", EachUser.usernum); + } } - if(user_fixed) - syslog(LOG_INFO, "control: fixed user count"); } @@ -119,7 +123,7 @@ void migrate_legacy_control_record(void) struct legacy_ctrl_format c; memset(&c, 0, sizeof(c)); - fp = fopen(file_citadel_control, "rb+"); + fp = fopen("citadel.control", "rb+"); if (fp != NULL) { syslog(LOG_INFO, "control: legacy format record found -- importing to db"); fread(&c, sizeof(struct legacy_ctrl_format), 1, fp); @@ -133,8 +137,8 @@ void migrate_legacy_control_record(void) CtdlSetConfigLong( "MMfulltext", c.MMfulltext); fclose(fp); - if (unlink(file_citadel_control) != 0) { - fprintf(stderr, "Unable to remove legacy control record %s after migrating it.\n", file_citadel_control); + if (unlink("citadel.control") != 0) { + fprintf(stderr, "Unable to remove legacy control record after migrating it.\n"); fprintf(stderr, "Exiting to prevent data corruption.\n"); exit(CTDLEXIT_CONFIG); } @@ -147,9 +151,15 @@ void migrate_legacy_control_record(void) */ void check_control(void) { - syslog(LOG_INFO, "control: sanity checking the recorded highest message, user, and room numbers"); + syslog(LOG_INFO, "control: sanity checking the recorded highest message and room numbers"); CtdlForEachRoom(control_find_highest, NULL); + syslog(LOG_INFO, "control: sanity checking the recorded highest user number"); ForEachUser(control_find_user, NULL); + syslog(LOG_INFO, "control: sanity checks complete"); + if (sanity_diag_mode == 1) { + syslog(LOG_INFO, "control: sanity check diagnostic mode is active - exiting now"); + abort(); + } } @@ -171,7 +181,7 @@ long get_new_message_number(void) /* * CtdlGetCurrentMessageNumber() - Obtain the current highest message number in the system * This provides a quick way to initialise a variable that might be used to indicate - * messages that should not be processed. EG. a new Sieve script will use this + * messages that should not be processed. For example, an inbox rules script will use this * to record determine that messages older than this should not be processed. * * (Why is this function here? Can't we just go straight to the config variable it fetches?) @@ -225,10 +235,6 @@ int confbool(char *v) /* * Get or set global configuration options - * - * IF YOU ADD OR CHANGE FIELDS HERE, YOU *MUST* DOCUMENT YOUR CHANGES AT: - * http://www.citadel.org/doku.php/documentation:appproto:system_config - * */ void cmd_conf(char *argbuf) { @@ -306,15 +312,15 @@ void cmd_conf(char *argbuf) cprintf("%s\n", CtdlGetConfigStr("c_journal_dest")); cprintf("%s\n", CtdlGetConfigStr("c_default_cal_zone")); cprintf("%d\n", CtdlGetConfigInt("c_pftcpdict_port")); - cprintf("%d\n", CtdlGetConfigInt("c_managesieve_port")); + cprintf("0\n"); cprintf("%d\n", CtdlGetConfigInt("c_auth_mode")); cprintf("\n"); cprintf("\n"); cprintf("\n"); cprintf("\n"); cprintf("%d\n", CtdlGetConfigInt("c_rbl_at_greeting")); - cprintf("%s\n", CtdlGetConfigStr("c_master_user")); - cprintf("%s\n", CtdlGetConfigStr("c_master_pass")); + cprintf("\n"); + cprintf("\n"); cprintf("%s\n", CtdlGetConfigStr("c_pager_program")); cprintf("%d\n", CtdlGetConfigInt("c_imap_keep_from")); cprintf("%d\n", CtdlGetConfigInt("c_xmpp_c2s_port")); @@ -512,7 +518,7 @@ void cmd_conf(char *argbuf) CtdlSetConfigInt("c_pftcpdict_port", atoi(buf)); break; case 51: - CtdlSetConfigInt("c_managesieve_port", atoi(buf)); + /* niu */ break; case 52: CtdlSetConfigInt("c_auth_mode", atoi(buf)); @@ -533,10 +539,10 @@ void cmd_conf(char *argbuf) CtdlSetConfigInt("c_rbl_at_greeting", confbool(buf)); break; case 58: - CtdlSetConfigStr("c_master_user", buf); + /* niu */ break; case 59: - CtdlSetConfigStr("c_master_pass", buf); + /* niu */ break; case 60: CtdlSetConfigStr("c_pager_program", buf); @@ -633,7 +639,7 @@ void cmd_conf(char *argbuf) cprintf("%d %s|\n", CIT_OK, v); } else if ( (v) && (!strcasecmp(cmd, "LOADVAL")) ) { - cprintf("%d %d\n", BINARY_FOLLOWS, strlen(v)); + cprintf("%d %d\n", BINARY_FOLLOWS, (int)strlen(v)); client_write(v, strlen(v)); } else { @@ -785,10 +791,6 @@ void cmd_gvdn(char *argbuf) /* MODULE INITIALIZATION STUFF */ /*****************************************************************************/ -void control_cleanup(void) -{ - DeleteHash(&CfgNameHash); -} CTDL_MODULE_INIT(control) { if (!threading) { @@ -800,8 +802,6 @@ CTDL_MODULE_INIT(control) CtdlRegisterProtoHook(cmd_gvdn, "GVDN", "get valid domain names"); CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration"); - CtdlRegisterCleanupHook(control_cleanup); - } /* return our id for the Log */ return "control";