/*
- * $Id$
- *
* This module handles states which are global to the entire server.
*
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2010 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
*/
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
}
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;
}
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");
}
if (control_fp != NULL) {
lock_control();
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();
+ memset(&CitControl, 0, sizeof(struct CitControl));
+
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);
- memset(&CitControl, 0, sizeof(struct CitControl));
+ 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);
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;
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));
}
/*
if (control_fp != NULL) {
rewind(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);
}
}
*/
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.
CtdlForEachRoom(control_find_highest, NULL);
}
-/**
+/*
* 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;
}
/*
* 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/documentation:appproto:system_config
+ *
*/
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("000\n");
}
case 66:
config.c_spam_flag_only = atoi(buf);
break;
+ case 67:
+ config.c_guest_logins = atoi(buf);
+ break;
}
++a;
}
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))
CtdlCreateRoom(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
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);
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.");
- /* return our Subversion id for the Log */
- return "$Id$";
+ if (!threading) {
+ CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration");
+ }
+ /* return our id for the Log */
+ return "control";
}
projects / citadel.git / blobdiff