when we did the login and replied, we mustn't try again to process the inbound comman...

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index c26aadbf0197cf5f99b0d64fb5c0777b410d93a8..cc3165531666dc4990ab151a8633ef3906df3e1b 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -12,45 +12,14 @@
  *  GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "control.h"
-#include "sysdep_decls.h"
-#include "support.h"
+
+#include "ctdl_module.h"
 #include "config.h"
-#include "msgbase.h"
 #include "citserver.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "database.h"
-#include "threads.h"
-#include "ctdl_module.h"
 
 struct CitControl CitControl;
 extern struct config config;
@@ -392,7 +361,7 @@ void cmd_conf(char *argbuf)
                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("1\n");
                cprintf("%d\n", config.c_allow_spoofing);
                cprintf("%d\n", config.c_journal_email);
                cprintf("%d\n", config.c_journal_pubmsgs);
@@ -599,7 +568,7 @@ void cmd_conf(char *argbuf)
                                config.c_auto_cull = atoi(buf);
                                break;
                        case 44:
-                               config.c_instant_expunge = atoi(buf);
+                               /* niu */
                                break;
                        case 45:
                                config.c_allow_spoofing = atoi(buf);
@@ -826,7 +795,10 @@ void cmd_gvdn(char *argbuf)
 /*                      MODULE INITIALIZATION STUFF                          */
 /*****************************************************************************/
 
-
+void control_cleanup(void)
+{
+       DeleteHash(&CfgNameHash);
+}
 CTDL_MODULE_INIT(control)
 {
        if (!threading) {
@@ -838,6 +810,8 @@ CTDL_MODULE_INIT(control)
 
                CtdlRegisterProtoHook(cmd_gvdn, "GVDN", "get valid domain names");
                CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration");
+               CtdlRegisterCleanupHook(control_cleanup);
+
        }
        /* return our id for the Log */
        return "control";