Misc code cleanup

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b4f37da6bc25614af15123dacd85be897d4e6117..bb52d0e877e2c535595a0c23c7eeb43fe081dfb2 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+Wed Oct 14 22:41:16 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Misc code cleanup
+
 1998-10-13 Nathan Bryant <bryant@cs.usm.maine.edu>
        * configure.in: don't check for -lcrypt unless autologin is enabled
        * file_ops.c: fix another overrun

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 8bc4541fdff14d9829dcabc921cfe87e7f3ec0aa..fca92cabb5e692bac5dc884a117b1fba92c7c63e 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -699,7 +699,6 @@ void *context_loop(struct CitContext *con)
                time(&CC->lastcmd);
                if (client_gets(cmdbuf) < 1) cleanup(EXIT_NULL);
                lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
-               /* hook_command_received(CC->cs_pid, cmdbuf); FIX */
 
                /*
                 * Let other clients see the last command we executed, but

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 0a3a81773dc67c7acbdfe803a4d508e5d393b54f..b29905827c465533603c03aa83d8b340b1c937bb 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -763,16 +763,13 @@ void save_message(char *mtmp,     /* file containing proper message */
        CC->quickroom.QRhighest = newmsgid;
        lputroom(&CC->quickroom, actual_rm);
 
-       /* Bump this user's messages posted counter.  Also, if the user is a
-        * twit, give them access to the twit room.
-        */
+       /* Bump this user's messages posted counter. */
        lgetuser(&CC->usersupp, CC->curr_user);
        CC->usersupp.posted = CC->usersupp.posted + 1;
-       /* FIX if user is twit, grant access to twitroom here */
        lputuser(&CC->usersupp, CC->curr_user);
 
        /* Network mail - send a copy to the network program. */
-       if ((strlen(recipient)>0)&&(mailtype != M_LOCAL)) {
+       if ( (strlen(recipient)>0) && (mailtype != M_LOCAL) ) {
                sprintf(aaa,"./network/spoolin/nm.%d",getpid());
                copy_file(mtmp,aaa);
                system("exec nohup ./netproc >/dev/null 2>&1 &");

diff --git a/citadel/setup.c b/citadel/setup.c
index 1a09e708e8de23efa54ba952e3f7a67a6e2902de..6ece366be9b0742a446dfc43e7249d461e24b9de 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -825,11 +825,11 @@ void write_config_to_disk(void) {
                display_error("setup: cannot open citadel.config");
                cleanup(1);
                }
-/******************************************/
-/* THIS IS TEMPORARY  FIX FIX FIX FIX FIX */
+/************************************************************************/
+/* FIX - This is a temporary system-wide default.  Add configurability. */
        config.c_ep.expire_mode = EXPIRE_NUMMSGS;
-       config.c_ep.expire_value = 10;
-/******************************************/
+       config.c_ep.expire_value = 150;
+/************************************************************************/
        fwrite((char *)&config,sizeof(struct config),1,fp);
        fclose(fp);
        }