X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontrol.c;h=03ffa7c75d09917455cd31fdf42cf427ba146414;hb=973a2dae902c5d7c5f89754d538749bec0de71af;hp=d340fcd0539795eb36813ef9f91c2e90b4130bc6;hpb=df760149065408b585995da925fba6deedb57054;p=citadel.git diff --git a/citadel/control.c b/citadel/control.c index d340fcd05..03ffa7c75 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -29,17 +29,19 @@ #include #include #include +#include #include "citadel.h" #include "server.h" #include "control.h" -#include "serv_extensions.h" #include "sysdep_decls.h" #include "support.h" #include "config.h" #include "msgbase.h" #include "citserver.h" -#include "tools.h" #include "room_ops.h" +#include "user_ops.h" +#include "database.h" +#include "threads.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" @@ -48,7 +50,7 @@ struct CitControl CitControl; extern struct config config; FILE *control_fp = NULL; - +long control_highest_user = 0; /* @@ -57,11 +59,85 @@ FILE *control_fp = NULL; */ void lock_control(void) { +#ifdef HAVE_FLOCK +/* + * TODO: solaris manpages describe this function, but the headers + * don't show it! + */ + if (flock(fileno(control_fp), (LOCK_EX | LOCK_NB))) { - lprintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control); - lprintf(CTDL_EMERG, "Is another citserver already running?\n"); + CtdlLogPrintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control); + CtdlLogPrintf(CTDL_EMERG, "Is another citserver already running?\n"); exit(CTDLEXIT_CONTROL); } +#endif +} + +/* + * callback to get highest room number when rebuilding control file + */ +void control_find_highest(struct ctdlroom *qrbuf, void *data) +{ + struct ctdlroom room; + struct cdbdata *cdbfr; + long *msglist; + int num_msgs=0; + int c; + int room_fixed = 0; + int message_fixed = 0; + + if (qrbuf->QRnumber > CitControl.MMnextroom) + { + CitControl.MMnextroom = qrbuf->QRnumber; + room_fixed = 1; + } + + getroom (&room, qrbuf->QRname); + + /* Load the message list */ + cdbfr = cdb_fetch(CDB_MSGLISTS, &room.QRnumber, sizeof(long)); + if (cdbfr != NULL) { + msglist = (long *) cdbfr->ptr; + num_msgs = cdbfr->len / sizeof(long); + } else { + return; /* No messages at all? No further action. */ + } + + if (num_msgs>0) + { + for (c=0; c CitControl.MMhighest) + { + CitControl.MMhighest = msglist[c]; + message_fixed = 1; + } + } + } + cdb_free(cdbfr); + if (room_fixed) + CtdlLogPrintf(CTDL_INFO, "Control record checking....Fixed room counter\n"); + if (message_fixed) + CtdlLogPrintf(CTDL_INFO, "Control record checking....Fixed message count\n"); + return; +} + + +/* + * Callback to get highest user number. + */ + +void control_find_user (struct ctdluser *EachUser, void *out_data) +{ + int user_fixed = 0; + + if (EachUser->usernum > CitControl.MMnextuser) + { + CitControl.MMnextuser = EachUser->usernum; + user_fixed = 1; + } + if(user_fixed) + CtdlLogPrintf(CTDL_INFO, "Control record checking....Fixed user count\n"); } @@ -70,6 +146,14 @@ void lock_control(void) */ void get_control(void) { + static int already_have_control = 0; + + /* + * If we already have the control record in memory, there's no point + * in reading it from disk again. + */ + if (already_have_control) return; + /* Zero it out. If the control record on disk is missing or short, * the system functions with all control record fields initialized * to zero. @@ -80,6 +164,8 @@ void get_control(void) if (control_fp != NULL) { lock_control(); fchown(fileno(control_fp), config.c_ctdluid, -1); + fchmod(fileno(control_fp), + S_IRUSR|S_IWUSR); } } if (control_fp == NULL) { @@ -87,6 +173,8 @@ void get_control(void) if (control_fp != NULL) { lock_control(); fchown(fileno(control_fp), config.c_ctdluid, -1); + fchmod(fileno(control_fp), + S_IRUSR|S_IWUSR); memset(&CitControl, 0, sizeof(struct CitControl)); fwrite(&CitControl, sizeof(struct CitControl), 1, control_fp); @@ -94,7 +182,7 @@ void get_control(void) } } if (control_fp == NULL) { - lprintf(CTDL_ALERT, "ERROR opening %s: %s\n", + CtdlLogPrintf(CTDL_ALERT, "ERROR opening %s: %s\n", file_citadel_control, strerror(errno)); return; @@ -102,6 +190,9 @@ void get_control(void) rewind(control_fp); fread(&CitControl, sizeof(struct CitControl), 1, control_fp); + already_have_control = 1; + chown(file_citadel_control, config.c_ctdluid, (-1)); + } /* @@ -119,6 +210,30 @@ void put_control(void) } +/* + * check_control - check the control record has sensible values for message, user and room numbers + */ +void check_control(void) +{ + CtdlLogPrintf(CTDL_INFO, "Checking/re-building control record\n"); + get_control(); + // Find highest room number and message number. + ForEachRoom(control_find_highest, NULL); + ForEachUser(control_find_user, NULL); + put_control(); +} + + +/** + * release_control - close our fd on exit + */ +void release_control(void) +{ + if (control_fp != NULL) + fclose(control_fp); + control_fp = NULL; +} + /* * get_new_message_number() - Obtain a new, unique ID to be used for a message. */ @@ -134,6 +249,23 @@ 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 + * to record determine that messages older than this should not be processed. + */ +long CtdlGetCurrentMessageNumber(void) +{ + long retval = 0L; + begin_critical_section(S_CONTROL); + get_control(); + retval = CitControl.MMhighest; + end_critical_section(S_CONTROL); + return(retval); +} + + /* * get_new_user_number() - Obtain a new, unique ID to be used for a user. */ @@ -247,6 +379,16 @@ void cmd_conf(char *argbuf) cprintf("%d\n", config.c_funambol_port); cprintf("%s\n", config.c_funambol_source); cprintf("%s\n", config.c_funambol_auth); + cprintf("%d\n", config.c_rbl_at_greeting); + cprintf("%s\n", config.c_master_user); + cprintf("%s\n", config.c_master_pass); + cprintf("%s\n", config.c_pager_program); + cprintf("%d\n", config.c_imap_keep_from); + cprintf("%d\n", config.c_xmpp_c2s_port); + cprintf("%d\n", config.c_xmpp_s2s_port); + cprintf("%ld\n", config.c_pop3_fetch); + cprintf("%ld\n", config.c_pop3_fastest); + cprintf("%d\n", config.c_spam_flag_only); cprintf("000\n"); } @@ -254,7 +396,7 @@ void cmd_conf(char *argbuf) unbuffer_output(); cprintf("%d Send configuration...\n", SEND_LISTING); a = 0; - while (client_getln(buf, sizeof buf), strcmp(buf, "000")) { + while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) { switch (a) { case 0: safestrncpy(config.c_nodename, buf, @@ -471,6 +613,38 @@ void cmd_conf(char *argbuf) buf, sizeof config.c_funambol_auth); break; + case 57: + config.c_rbl_at_greeting = atoi(buf); + break; + case 58: + safestrncpy(config.c_master_user, buf, sizeof config.c_master_user); + break; + case 59: + safestrncpy(config.c_master_pass, buf, sizeof config.c_master_pass); + break; + case 60: + safestrncpy(config.c_pager_program, + buf, + sizeof config.c_pager_program); + break; + case 61: + config.c_imap_keep_from = atoi(buf); + break; + case 62: + config.c_xmpp_c2s_port = atoi(buf); + break; + case 63: + config.c_xmpp_s2s_port = atoi(buf); + break; + case 64: + config.c_pop3_fetch = atol(buf); + break; + case 65: + config.c_pop3_fastest = atol(buf); + break; + case 66: + config.c_spam_flag_only = atoi(buf); + break; } ++a; } @@ -480,7 +654,7 @@ void cmd_conf(char *argbuf) CC->curr_user); aide_message(buf,"Citadel Configuration Manager Message"); - if (strlen(config.c_logpages) > 0) + if (!IsEmptyStr(config.c_logpages)) create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS); /* If full text indexing has been disabled, invalidate the @@ -512,8 +686,7 @@ void cmd_conf(char *argbuf) extract_token(confname, argbuf, 1, '|', sizeof confname); unbuffer_output(); cprintf("%d %s\n", SEND_LISTING, confname); - confptr = CtdlReadMessageBody("000", - config.c_maxmsglen, NULL, 0); + confptr = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0); CtdlPutSysConfig(confname, confptr); free(confptr); }