merged remaining changes from TRANSACTIONS (using cvs update -j TRANSACTIONS)

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 5b671d0fba90ad7d8dcf35faf7902677a6404ae9..08f4c4f8c4a998fc1373a722890db2972c83116d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -80,18 +80,12 @@ void master_startup(void) {
 
 /*
  * Cleanup routine to be called when the server is shutting down.
+ * WARNING: It's no longer safe to call this function to force a shutdown.
+ * Instead, set time_to_die = 1.
  */
 void master_cleanup(void) {
        struct CleanupFunctionHook *fcn;
 
-       /* Cancel all running sessions */
-       lprintf(7, "Cancelling running sessions...\n");
-
-/* FIXME do something here
-       while (ContextList != NULL) {
-               }
- */
-
        /* Run any cleanup routines registered by loadable modules */
        for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
                (*fcn->h_function_pointer)();
@@ -713,7 +707,7 @@ void cmd_down(void) {
        if (CtdlAccessCheck(ac_aide)) return;
 
        cprintf("%d Shutting down server.  Goodbye.\n", OK);
-       master_cleanup();
+       time_to_die = 1;
        }
 
 /*