#include <string.h>
#include <errno.h>
#include <limits.h>
-#include <syslog.h>
#include <sys/types.h>
#include "citadel.h"
#include "server.h"
#include "control.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "support.h"
#include "config.h"
}
}
if (control_fp == NULL) {
- lprintf(1, "ERROR opening citadel.control: %s\n",
+ lprintf(CTDL_ALERT, "ERROR opening citadel.control: %s\n",
strerror(errno));
return;
}
*/
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_bbs_city);
cprintf("%s\n", config.c_sysadm);
cprintf("%d\n", config.c_maxsessions);
- cprintf("%s\n", config.c_net_password);
+ cprintf("xxx\n"); /* placeholder -- field no longer in use */
cprintf("%d\n", config.c_userpurge);
cprintf("%d\n", config.c_roompurge);
cprintf("%s\n", config.c_logpages);
cprintf("%d\n", config.c_max_workers);
cprintf("%d\n", config.c_pop3_port);
cprintf("%d\n", config.c_smtp_port);
- cprintf("0\n"); /* position 25 no longer exists */
+ cprintf("%d\n", config.c_rfc822_strict_from);
cprintf("%d\n", config.c_aide_zap);
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"); /* no longer in use */
+ 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("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,
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:
- safestrncpy(config.c_net_password, buf,
- sizeof config.c_net_password);
+ /* placeholder -- field no longer in use */
break;
case 16:
config.c_userpurge = atoi(buf);
case 24:
config.c_smtp_port = atoi(buf);
break;
- /* case 25 no longer exists */
+ case 25:
+ config.c_rfc822_strict_from = atoi(buf);
+ break;
case 26:
config.c_aide_zap = atoi(buf);
if (config.c_aide_zap != 0)
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;
+ /* no longer in use */
+ break;
+ case 31:
+ if ((config.c_purge_hour >= 0)
+ && (config.c_purge_hour <= 23)) {
+ 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;
}
++a;
aide_message(buf);
if (strlen(config.c_logpages) > 0)
- create_room(config.c_logpages, 3, "", 0, 1, 1);
+ create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
}
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);
+ confptr = CtdlReadMessageBody("000",
+ config.c_maxmsglen, NULL, 0);
CtdlPutSysConfig(confname, confptr);
- phree(confptr);
+ free(confptr);
}
else {