*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <limits.h>
#include <sys/types.h>
+#include <sys/file.h>
#include "citadel.h"
#include "server.h"
#include "control.h"
-#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "support.h"
#include "config.h"
extern struct config config;
FILE *control_fp = NULL;
+
+
+/*
+ * lock_control - acquire a lock on the control record file.
+ * This keeps multiple citservers from running concurrently.
+ */
+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");
+ exit(CTDLEXIT_CONTROL);
+ }
+#endif
+}
+
+
/*
* get_control - read the control record into memory.
*/
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
*/
memset(&CitControl, 0, sizeof(struct CitControl));
if (control_fp == NULL) {
- control_fp = fopen("citadel.control", "rb+");
+ control_fp = fopen(file_citadel_control, "rb+");
if (control_fp != NULL) {
- fchown(fileno(control_fp), config.c_bbsuid, -1);
+ lock_control();
+ fchown(fileno(control_fp), config.c_ctdluid, -1);
}
}
if (control_fp == NULL) {
- control_fp = fopen("citadel.control", "wb+");
+ control_fp = fopen(file_citadel_control, "wb+");
if (control_fp != NULL) {
- fchown(fileno(control_fp), config.c_bbsuid, -1);
+ lock_control();
+ fchown(fileno(control_fp), config.c_ctdluid, -1);
memset(&CitControl, 0, sizeof(struct CitControl));
fwrite(&CitControl, sizeof(struct CitControl),
1, control_fp);
}
}
if (control_fp == NULL) {
- lprintf(1, "ERROR opening citadel.control: %s\n",
- strerror(errno));
+ lprintf(CTDL_ALERT, "ERROR opening %s: %s\n",
+ file_citadel_control,
+ strerror(errno));
return;
}
rewind(control_fp);
fread(&CitControl, sizeof(struct CitControl), 1, control_fp);
+ already_have_control = 1;
}
/*
}
}
+/**
+ * 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.
*/
long get_new_message_number(void)
{
+ long retval = 0L;
begin_critical_section(S_CONTROL);
get_control();
- ++CitControl.MMhighest;
+ retval = ++CitControl.MMhighest;
put_control();
end_critical_section(S_CONTROL);
- return (CitControl.MMhighest);
+ return(retval);
}
*/
long get_new_user_number(void)
{
+ long retval = 0L;
begin_critical_section(S_CONTROL);
get_control();
- ++CitControl.MMnextuser;
+ retval = ++CitControl.MMnextuser;
put_control();
end_critical_section(S_CONTROL);
- return (CitControl.MMnextuser);
+ return(retval);
}
*/
long get_new_room_number(void)
{
+ long retval = 0L;
begin_critical_section(S_CONTROL);
get_control();
- ++CitControl.MMnextroom;
+ retval = ++CitControl.MMnextroom;
put_control();
end_critical_section(S_CONTROL);
- return (CitControl.MMnextroom);
+ return(retval);
}
*/
void cmd_conf(char *argbuf)
{
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[16];
+ char buf[256];
int a;
char *confptr;
- char confname[SIZ];
+ char confname[128];
if (CtdlAccessCheck(ac_aide)) return;
- extract(cmd, argbuf, 0);
+ extract_token(cmd, argbuf, 0, '|', sizeof cmd);
if (!strcasecmp(cmd, "GET")) {
cprintf("%d Configuration...\n", LISTING_FOLLOWS);
cprintf("%s\n", config.c_nodename);
cprintf("%s\n", config.c_twitroom);
cprintf("%s\n", config.c_moreprompt);
cprintf("%d\n", config.c_restrict);
- cprintf("%s\n", config.c_bbs_city);
+ cprintf("%s\n", config.c_site_location);
cprintf("%s\n", config.c_sysadm);
cprintf("%d\n", config.c_maxsessions);
cprintf("xxx\n"); /* placeholder -- field no longer in use */
cprintf("%d\n", config.c_imap_port);
cprintf("%ld\n", config.c_net_freq);
cprintf("%d\n", config.c_disable_newu);
- cprintf("%d\n", config.c_aide_mailboxes);
+ cprintf("1\n"); /* niu */
cprintf("%d\n", config.c_purge_hour);
+#ifdef HAVE_LDAP
+ cprintf("%s\n", config.c_ldap_host);
+ cprintf("%d\n", config.c_ldap_port);
+ cprintf("%s\n", config.c_ldap_base_dn);
+ cprintf("%s\n", config.c_ldap_bind_dn);
+ cprintf("%s\n", config.c_ldap_bind_pw);
+#else
+ cprintf("\n");
+ cprintf("0\n");
+ cprintf("\n");
+ cprintf("\n");
+ cprintf("\n");
+#endif
+ cprintf("%s\n", config.c_ip_addr);
+ cprintf("%d\n", config.c_msa_port);
+ cprintf("%d\n", config.c_imaps_port);
+ cprintf("%d\n", config.c_pop3s_port);
+ cprintf("%d\n", config.c_smtps_port);
+ cprintf("%d\n", config.c_enable_fulltext);
+ cprintf("%d\n", config.c_auto_cull);
+ cprintf("%d\n", config.c_instant_expunge);
+ cprintf("%d\n", config.c_allow_spoofing);
+ cprintf("%d\n", config.c_journal_email);
+ cprintf("%d\n", config.c_journal_pubmsgs);
+ cprintf("%s\n", config.c_journal_dest);
+ cprintf("%s\n", config.c_default_cal_zone);
+ cprintf("%d\n", config.c_pftcpdict_port);
+ cprintf("%d\n", config.c_managesieve_port);
+ cprintf("%d\n", config.c_auth_mode);
+ cprintf("%s\n", config.c_funambol_host);
+ 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("000\n");
}
else if (!strcasecmp(cmd, "SET")) {
+ unbuffer_output();
cprintf("%d Send configuration...\n", SEND_LISTING);
a = 0;
- while (client_gets(buf), strcmp(buf, "000")) {
+ while (client_getln(buf, sizeof buf), strcmp(buf, "000")) {
switch (a) {
case 0:
safestrncpy(config.c_nodename, buf,
config.c_restrict = 1;
break;
case 12:
- safestrncpy(config.c_bbs_city, buf,
- sizeof config.c_bbs_city);
+ safestrncpy(config.c_site_location, buf,
+ sizeof config.c_site_location);
break;
case 13:
safestrncpy(config.c_sysadm, buf,
break;
case 14:
config.c_maxsessions = atoi(buf);
- if (config.c_maxsessions < 1)
- config.c_maxsessions = 1;
+ if (config.c_maxsessions < 0)
+ config.c_maxsessions = 0;
break;
case 15:
/* placeholder -- field no longer in use */
config.c_disable_newu = 1;
break;
case 30:
- config.c_aide_mailboxes = atoi(buf);
- if (config.c_aide_mailboxes != 0)
- config.c_aide_mailboxes = 1;
+ /* niu */
break;
case 31:
if ((config.c_purge_hour >= 0)
config.c_purge_hour = atoi(buf);
}
break;
+#ifdef HAVE_LDAP
+ case 32:
+ safestrncpy(config.c_ldap_host, buf,
+ sizeof config.c_ldap_host);
+ break;
+ case 33:
+ config.c_ldap_port = atoi(buf);
+ break;
+ case 34:
+ safestrncpy(config.c_ldap_base_dn, buf,
+ sizeof config.c_ldap_base_dn);
+ break;
+ case 35:
+ safestrncpy(config.c_ldap_bind_dn, buf,
+ sizeof config.c_ldap_bind_dn);
+ break;
+ case 36:
+ safestrncpy(config.c_ldap_bind_pw, buf,
+ sizeof config.c_ldap_bind_pw);
+ break;
+#endif
+ case 37:
+ safestrncpy(config.c_ip_addr, buf,
+ sizeof config.c_ip_addr);
+ case 38:
+ config.c_msa_port = atoi(buf);
+ break;
+ case 39:
+ config.c_imaps_port = atoi(buf);
+ break;
+ case 40:
+ config.c_pop3s_port = atoi(buf);
+ break;
+ case 41:
+ config.c_smtps_port = atoi(buf);
+ break;
+ case 42:
+ config.c_enable_fulltext = atoi(buf);
+ break;
+ case 43:
+ config.c_auto_cull = atoi(buf);
+ break;
+ case 44:
+ config.c_instant_expunge = atoi(buf);
+ break;
+ case 45:
+ config.c_allow_spoofing = atoi(buf);
+ break;
+ case 46:
+ config.c_journal_email = atoi(buf);
+ break;
+ case 47:
+ config.c_journal_pubmsgs = atoi(buf);
+ break;
+ case 48:
+ safestrncpy(config.c_journal_dest, buf,
+ sizeof config.c_journal_dest);
+ case 49:
+ safestrncpy(config.c_default_cal_zone, buf,
+ sizeof config.c_default_cal_zone);
+ break;
+ case 50:
+ config.c_pftcpdict_port = atoi(buf);
+ break;
+ case 51:
+ config.c_managesieve_port = atoi(buf);
+ break;
+ case 52:
+ config.c_auth_mode = atoi(buf);
+ case 53:
+ safestrncpy(config.c_funambol_host, buf,
+ sizeof config.c_funambol_host);
+ break;
+ case 54:
+ config.c_funambol_port = atoi(buf);
+ break;
+ case 55:
+ safestrncpy(config.c_funambol_source,
+ buf,
+ sizeof config.c_funambol_source);
+ break;
+ case 56:
+ safestrncpy(config.c_funambol_auth,
+ buf,
+ sizeof config.c_funambol_auth);
+ break;
+ case 57:
+ config.c_rbl_at_greeting = atoi(buf);
+ break;
}
++a;
}
put_config();
snprintf(buf, sizeof buf,
- "Global system configuration edited by %s\n",
+ "The global system configuration has been edited by %s.\n",
CC->curr_user);
- aide_message(buf);
+ aide_message(buf,"Citadel Configuration Manager Message");
+
+ if (!IsEmptyStr(config.c_logpages))
+ create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
- if (strlen(config.c_logpages) > 0)
- create_room(config.c_logpages, 3, "", 0, 1, 1);
+ /* If full text indexing has been disabled, invalidate the
+ * index so it doesn't try to use it later.
+ */
+ if (config.c_enable_fulltext == 0) {
+ CitControl.fulltext_wordbreaker = 0;
+ put_control();
+ }
}
else if (!strcasecmp(cmd, "GETSYS")) {
- extract(confname, argbuf, 1);
+ extract_token(confname, argbuf, 1, '|', sizeof confname);
confptr = CtdlGetSysConfig(confname);
if (confptr != NULL) {
cprintf("%d %s\n", LISTING_FOLLOWS, confname);
if (confptr[strlen(confptr) - 1] != 10)
client_write("\n", 1);
cprintf("000\n");
- phree(confptr);
+ free(confptr);
} else {
cprintf("%d No such configuration.\n",
ERROR + ILLEGAL_VALUE);
}
else if (!strcasecmp(cmd, "PUTSYS")) {
- extract(confname, argbuf, 1);
+ 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);
- phree(confptr);
+ free(confptr);
}
else {
projects / citadel.git / blobdiff