X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontrol.c;h=b81526cf1dc855078349afb8ed70a4803bb0388d;hb=a9d212c452ddc4c041c6b1ca30670dde9a321a07;hp=03ffa7c75d09917455cd31fdf42cf427ba146414;hpb=605ffeb2eb1b1426bf93a9babc8ca40cd926b6de;p=citadel.git diff --git a/citadel/control.c b/citadel/control.c index 03ffa7c75..b81526cf1 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -1,8 +1,15 @@ /* - * $Id$ - * * This module handles states which are global to the entire server. * + * Copyright (c) 1987-2012 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "sysdep.h" @@ -29,6 +36,7 @@ #include #include #include +#include #include #include "citadel.h" #include "server.h" @@ -47,6 +55,8 @@ #include "snprintf.h" #endif +#include "ctdl_module.h" + struct CitControl CitControl; extern struct config config; FILE *control_fp = NULL; @@ -59,15 +69,10 @@ long control_highest_user = 0; */ void lock_control(void) { -#ifdef HAVE_FLOCK -/* - * TODO: solaris manpages describe this function, but the headers - * don't show it! - */ - +#if defined(LOCK_EX) && defined(LOCK_NB) if (flock(fileno(control_fp), (LOCK_EX | LOCK_NB))) { - CtdlLogPrintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control); - CtdlLogPrintf(CTDL_EMERG, "Is another citserver already running?\n"); + syslog(LOG_EMERG, "citserver: unable to lock %s.\n", file_citadel_control); + syslog(LOG_EMERG, "Is another citserver already running?\n"); exit(CTDLEXIT_CONTROL); } #endif @@ -92,7 +97,7 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data) room_fixed = 1; } - getroom (&room, qrbuf->QRname); + CtdlGetRoom (&room, qrbuf->QRname); /* Load the message list */ cdbfr = cdb_fetch(CDB_MSGLISTS, &room.QRnumber, sizeof(long)); @@ -116,9 +121,9 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data) } cdb_free(cdbfr); if (room_fixed) - CtdlLogPrintf(CTDL_INFO, "Control record checking....Fixed room counter\n"); + syslog(LOG_INFO, "Control record checking....Fixed room counter\n"); if (message_fixed) - CtdlLogPrintf(CTDL_INFO, "Control record checking....Fixed message count\n"); + syslog(LOG_INFO, "Control record checking....Fixed message count\n"); return; } @@ -137,7 +142,7 @@ void control_find_user (struct ctdluser *EachUser, void *out_data) user_fixed = 1; } if(user_fixed) - CtdlLogPrintf(CTDL_INFO, "Control record checking....Fixed user count\n"); + syslog(LOG_INFO, "Control record checking....Fixed user count\n"); } @@ -147,6 +152,7 @@ void control_find_user (struct ctdluser *EachUser, void *out_data) void get_control(void) { static int already_have_control = 0; + int rv = 0; /* * If we already have the control record in memory, there's no point @@ -163,36 +169,53 @@ void get_control(void) control_fp = fopen(file_citadel_control, "rb+"); if (control_fp != NULL) { lock_control(); - fchown(fileno(control_fp), config.c_ctdluid, -1); - fchmod(fileno(control_fp), - S_IRUSR|S_IWUSR); + rv = fchown(fileno(control_fp), config.c_ctdluid, -1); + if (rv == -1) + syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", + file_citadel_control, strerror(errno)); + rv = fchmod(fileno(control_fp), S_IRUSR|S_IWUSR); + if (rv == -1) + syslog(LOG_EMERG, "Failed to adjust accessrights of: %s [%s]\n", + file_citadel_control, strerror(errno)); } } if (control_fp == NULL) { control_fp = fopen(file_citadel_control, "wb+"); 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); + + rv = fchown(fileno(control_fp), config.c_ctdluid, -1); + if (rv == -1) + syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", + file_citadel_control, strerror(errno)); + + rv = fchmod(fileno(control_fp), S_IRUSR|S_IWUSR); + if (rv == -1) + syslog(LOG_EMERG, "Failed to adjust accessrights of: %s [%s]\n", + file_citadel_control, strerror(errno)); + rv = fwrite(&CitControl, sizeof(struct CitControl), 1, control_fp); + if (rv == -1) + syslog(LOG_EMERG, "Failed to write: %s [%s]\n", + file_citadel_control, strerror(errno)); rewind(control_fp); } } if (control_fp == NULL) { - CtdlLogPrintf(CTDL_ALERT, "ERROR opening %s: %s\n", - file_citadel_control, - strerror(errno)); + syslog(LOG_ALERT, "ERROR opening %s: %s\n", file_citadel_control, strerror(errno)); return; } rewind(control_fp); - fread(&CitControl, sizeof(struct CitControl), 1, control_fp); + rv = fread(&CitControl, sizeof(struct CitControl), 1, control_fp); + if (rv == -1) + syslog(LOG_EMERG, "Failed to read Controlfile: %s [%s]\n", + file_citadel_control, strerror(errno)); already_have_control = 1; - chown(file_citadel_control, config.c_ctdluid, (-1)); - + rv = chown(file_citadel_control, config.c_ctdluid, (-1)); + if (rv == -1) + syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", + file_citadel_control, strerror(errno)); } /* @@ -200,11 +223,14 @@ void get_control(void) */ void put_control(void) { + int rv = 0; if (control_fp != NULL) { rewind(control_fp); - fwrite(&CitControl, sizeof(struct CitControl), 1, - control_fp); + rv = fwrite(&CitControl, sizeof(struct CitControl), 1, control_fp); + if (rv == -1) + syslog(LOG_EMERG, "Failed to write: %s [%s]\n", + file_citadel_control, strerror(errno)); fflush(control_fp); } } @@ -215,22 +241,23 @@ void put_control(void) */ void check_control(void) { - CtdlLogPrintf(CTDL_INFO, "Checking/re-building control record\n"); + syslog(LOG_INFO, "Checking/re-building control record\n"); get_control(); // Find highest room number and message number. - ForEachRoom(control_find_highest, NULL); + CtdlForEachRoom(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) + if (control_fp != NULL) { fclose(control_fp); + } control_fp = NULL; } @@ -300,6 +327,10 @@ long get_new_room_number(void) /* * 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?id=documentation:applicationprotocol + * */ void cmd_conf(char *argbuf) { @@ -389,6 +420,9 @@ void cmd_conf(char *argbuf) cprintf("%ld\n", config.c_pop3_fetch); cprintf("%ld\n", config.c_pop3_fastest); cprintf("%d\n", config.c_spam_flag_only); + cprintf("%d\n", config.c_guest_logins); + cprintf("%d\n", config.c_port_number); + cprintf("%d\n", config.c_ctdluid); cprintf("000\n"); } @@ -645,17 +679,27 @@ void cmd_conf(char *argbuf) case 66: config.c_spam_flag_only = atoi(buf); break; + case 67: + config.c_guest_logins = atoi(buf); + break; + case 68: + config.c_port_number = atoi(buf); + break; + case 69: + config.c_ctdluid = atoi(buf); + break; } ++a; } put_config(); snprintf(buf, sizeof buf, - "The global system configuration has been edited by %s.\n", - CC->curr_user); - aide_message(buf,"Citadel Configuration Manager Message"); + "The global system configuration has been edited by %s.\n", + (CC->logged_in ? CC->curr_user : "an administrator") + ); + CtdlAideMessage(buf,"Citadel Configuration Manager Message"); if (!IsEmptyStr(config.c_logpages)) - create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS); + CtdlCreateRoom(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS); /* If full text indexing has been disabled, invalidate the * index so it doesn't try to use it later. @@ -670,9 +714,12 @@ void cmd_conf(char *argbuf) extract_token(confname, argbuf, 1, '|', sizeof confname); confptr = CtdlGetSysConfig(confname); if (confptr != NULL) { + long len; + + len = strlen(confptr); cprintf("%d %s\n", LISTING_FOLLOWS, confname); - client_write(confptr, strlen(confptr)); - if (confptr[strlen(confptr) - 1] != 10) + client_write(confptr, len); + if ((len > 0) && (confptr[len - 1] != 10)) client_write("\n", 1); cprintf("000\n"); free(confptr); @@ -686,7 +733,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, 0); + confptr = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0); CtdlPutSysConfig(confname, confptr); free(confptr); } @@ -696,3 +743,18 @@ void cmd_conf(char *argbuf) ERROR + ILLEGAL_VALUE); } } + + +/*****************************************************************************/ +/* MODULE INITIALIZATION STUFF */ +/*****************************************************************************/ + + +CTDL_MODULE_INIT(control) +{ + if (!threading) { + CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration"); + } + /* return our id for the Log */ + return "control"; +}