*
* This module handles states which are global to the entire server.
*
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
*/
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");
room_fixed = 1;
}
- getroom (&room, qrbuf->QRname);
+ CtdlGetRoom (&room, qrbuf->QRname);
/* Load the message list */
cdbfr = cdb_fetch(CDB_MSGLISTS, &room.QRnumber, sizeof(long));
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
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);
+ rv = fchmod(fileno(control_fp), S_IRUSR|S_IWUSR);
}
}
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);
+ rv = fchown(fileno(control_fp), config.c_ctdluid, -1);
+ rv = fchmod(fileno(control_fp), S_IRUSR|S_IWUSR);
memset(&CitControl, 0, sizeof(struct CitControl));
- fwrite(&CitControl, sizeof(struct CitControl),
- 1, control_fp);
+ rv = fwrite(&CitControl, sizeof(struct CitControl), 1, control_fp);
rewind(control_fp);
}
}
if (control_fp == NULL) {
- CtdlLogPrintf(CTDL_ALERT, "ERROR opening %s: %s\n",
- file_citadel_control,
- strerror(errno));
+ CtdlLogPrintf(CTDL_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);
already_have_control = 1;
- chown(file_citadel_control, config.c_ctdluid, (-1));
+ rv = chown(file_citadel_control, config.c_ctdluid, (-1));
}
*/
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);
fflush(control_fp);
}
}
CtdlLogPrintf(CTDL_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();
}
snprintf(buf, sizeof buf,
"The global system configuration has been edited by %s.\n",
CC->curr_user);
- aide_message(buf,"Citadel Configuration Manager Message");
+ 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.
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);
}
CTDL_MODULE_INIT(control)
{
- CtdlRegisterProtoHook(cmd_conf, "CONF", "Autoconverted. TODO: document me.");
+ if (!threading) {
+ CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration");
+ }
/* return our Subversion id for the Log */
return "$Id$";
}