/*
* This module handles states which are global to the entire server.
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 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.
/*
* 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)
{
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));
return; /* No messages at all? No further action. */
}
- if (num_msgs>0)
- {
- for (c=0; c<num_msgs; c++)
- {
- if (msglist[c] > CtdlGetConfigLong("MMhighest"))
- {
- CtdlSetConfigLong("MMhighest", msglist[c]);
- message_fixed = 1;
+ if (num_msgs > 0) {
+ for (c=0; c<num_msgs; c++) {
+ if (msglist[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;
}
/*
* Callback to get highest user number.
*/
-
-void control_find_user (struct ctdluser *EachUser, void *out_data)
+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;
+ 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");
}
*/
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();
+ }
}
cprintf("%d\n", CtdlGetConfigInt("c_pftcpdict_port"));
cprintf("%d\n", CtdlGetConfigInt("c_managesieve_port"));
cprintf("%d\n", CtdlGetConfigInt("c_auth_mode"));
- cprintf("%s\n", CtdlGetConfigStr("c_funambol_host"));
- cprintf("%d\n", CtdlGetConfigInt("c_funambol_port"));
- cprintf("%s\n", CtdlGetConfigStr("c_funambol_source"));
- cprintf("%s\n", CtdlGetConfigStr("c_funambol_auth"));
+ 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"));
CtdlSetConfigInt("c_auth_mode", atoi(buf));
break;
case 53:
- CtdlSetConfigStr("c_funambol_host", buf);
+ /* niu */
break;
case 54:
- CtdlSetConfigInt("c_funambol_port", atoi(buf));
+ /* niu */
break;
case 55:
- CtdlSetConfigStr("c_funambol_source", buf);
+ /* niu */
break;
case 56:
- CtdlSetConfigStr("c_funambol_auth", buf);
+ /* niu */
break;
case 57:
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);
}
// CONF GETVAL - retrieve configuration variables from the database
- else if (!strcasecmp(cmd, "GETVAL")) {
+ // CONF LOADVAL - same thing but can handle variables bigger than 1 KB
+ else if ( (!strcasecmp(cmd, "GETVAL")) || (!strcasecmp(cmd, "LOADVAL")) ) {
extract_token(confname, argbuf, 1, '|', sizeof confname);
char *v = CtdlGetConfigStr(confname);
- if (v) {
+ if ( (v) && (!strcasecmp(cmd, "GETVAL")) ) {
cprintf("%d %s|\n", CIT_OK, v);
}
+ else if ( (v) && (!strcasecmp(cmd, "LOADVAL")) ) {
+ cprintf("%d %d\n", BINARY_FOLLOWS, (int)strlen(v));
+ client_write(v, strlen(v));
+ }
else {
cprintf("%d |\n", ERROR);
}
}
- // CONF PUTVAL - store configuration variables from the database
+ // CONF PUTVAL - store configuration variables in the database
else if (!strcasecmp(cmd, "PUTVAL")) {
if (num_tokens(argbuf, '|') < 3) {
cprintf("%d name and value required\n", ERROR);
}
}
+ // CONF STOREVAL - store configuration variables in the database bigger than 1 KB
+ else if (!strcasecmp(cmd, "STOREVAL")) {
+ if (num_tokens(argbuf, '|') < 3) {
+ cprintf("%d name and length required\n", ERROR);
+ }
+ else {
+ extract_token(confname, argbuf, 1, '|', sizeof confname);
+ int bytes = extract_int(argbuf, 2);
+ char *valbuf = malloc(bytes + 1);
+ cprintf("%d %d\n", SEND_BINARY, bytes);
+ client_read(valbuf, bytes);
+ valbuf[bytes+1] = 0;
+ CtdlSetConfigStr(confname, valbuf);
+ free(valbuf);
+ }
+ }
+
// CONF LISTVAL - list configuration variables in the database and their values
else if (!strcasecmp(cmd, "LISTVAL")) {
struct cdbdata *cdbcfg;
cprintf("%d all configuration variables\n", LISTING_FOLLOWS);
cdb_rewind(CDB_CONFIG);
while (cdbcfg = cdb_next_item(CDB_CONFIG), cdbcfg != NULL) {
- keylen = strlen(cdbcfg->ptr);
- key = cdbcfg->ptr;
- value = cdbcfg->ptr + keylen + 1;
- cprintf("%s|%s\n", key, value);
+ if (cdbcfg->len < 1020) {
+ keylen = strlen(cdbcfg->ptr);
+ key = cdbcfg->ptr;
+ value = cdbcfg->ptr + keylen + 1;
+ cprintf("%s|%s\n", key, value);
+ }
cdb_free(cdbcfg);
}
cprintf("000\n");
projects / citadel.git / blobdiff