*/
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));
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$";
}