* Applied a patch sent in by Wilfried Goesgens which allows the various

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 93e5324d0e6b2dd60f58a34de23a57837d76eb3a..bad2a68d3ab893c4765d66f77af0072fe5df6fd6 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -64,15 +64,27 @@ void get_control(void)
         */
        memset(&CitControl, 0, sizeof(struct CitControl));
        if (control_fp == NULL) {
-               control_fp = fopen("citadel.control", "rb+");
+               control_fp = fopen(
+#ifndef HAVE_RUN_DIR
+                                                  "."
+#else
+                                                  RUN_DIR
+#endif
+                                                  "/citadel.control", "rb+");
                if (control_fp != NULL) {
-                       fchown(fileno(control_fp), config.c_bbsuid, -1);
+                       fchown(fileno(control_fp), config.c_ctdluid, -1);
                }
        }
        if (control_fp == NULL) {
-               control_fp = fopen("citadel.control", "wb+");
+               control_fp = fopen(
+#ifndef HAVE_RUN_DIR
+                                                  "."
+#else
+                                                  RUN_DIR
+#endif
+                                                  "/citadel.control", "wb+");
                if (control_fp != NULL) {
-                       fchown(fileno(control_fp), config.c_bbsuid, -1);
+                       fchown(fileno(control_fp), config.c_ctdluid, -1);
                        memset(&CitControl, 0, sizeof(struct CitControl));
                        fwrite(&CitControl, sizeof(struct CitControl),
                               1, control_fp);
@@ -153,15 +165,15 @@ long get_new_room_number(void)
  */
 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);
@@ -176,7 +188,7 @@ void cmd_conf(char *argbuf)
                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 */
@@ -194,7 +206,7 @@ void cmd_conf(char *argbuf)
                cprintf("%d\n", config.c_imap_port);
                cprintf("%ld\n", config.c_net_freq);
                cprintf("%d\n", config.c_disable_newu);
-               cprintf("1\n"); /* no longer in use */
+               cprintf("1\n"); /* niu */
                cprintf("%d\n", config.c_purge_hour);
 #ifdef HAVE_LDAP
                cprintf("%s\n", config.c_ldap_host);
@@ -210,6 +222,12 @@ void cmd_conf(char *argbuf)
                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("000\n");
        }
 
@@ -217,7 +235,7 @@ void cmd_conf(char *argbuf)
                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,
@@ -272,8 +290,8 @@ void cmd_conf(char *argbuf)
                                        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,
@@ -340,7 +358,7 @@ void cmd_conf(char *argbuf)
                                        config.c_disable_newu = 1;
                                break;
                        case 30:
-                               /* no longer in use */
+                               /* niu */
                                break;
                        case 31:
                                if ((config.c_purge_hour >= 0)
@@ -372,6 +390,24 @@ void cmd_conf(char *argbuf)
                        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;
                        }
                        ++a;
                }
@@ -382,11 +418,19 @@ void cmd_conf(char *argbuf)
                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);
+
+               /* 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);
@@ -402,7 +446,7 @@ void cmd_conf(char *argbuf)
        }
 
        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",