X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fctdlproto%2Fserv_syscmds.c;h=28e2ea60657fd155c10b82f2d6785f007846eca6;hb=29054912680f4f66a84ac947de38b8e99a1c4d80;hp=013e1408902aa9aef626a50ceed29f86347eb26a;hpb=6f9208392ee576a322edbc389c32d27ceaa3c04f;p=citadel.git

diff --git a/citadel/modules/ctdlproto/serv_syscmds.c b/citadel/modules/ctdlproto/serv_syscmds.c
index 013e14089..28e2ea606 100644
--- a/citadel/modules/ctdlproto/serv_syscmds.c
+++ b/citadel/modules/ctdlproto/serv_syscmds.c
@@ -1,17 +1,14 @@
-
-/* 
- * Main source module for the Citadel server
- *
- * Copyright (c) 1987-2018 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// System management commands for Citadel server
+//
+// Copyright (c) 1987-2021 by the citadel.org team
+//
+// This program is open source software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License, version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
 #include <stdio.h>
 #include <libcitadel.h>
@@ -20,33 +17,22 @@
 #include "ctdl_module.h"
 
 
-/*
- * Shut down the server
- */
+// Shut down or restart the server
 void cmd_down(char *argbuf) {
 	char *Reply ="%d Shutting down server.  Goodbye.\n";
 
 	if (CtdlAccessCheck(ac_aide)) return;
 
-	if (!IsEmptyStr(argbuf))
-	{
+	if (!IsEmptyStr(argbuf)) {
 		int state = CIT_OK;
 		restart_server = extract_int(argbuf, 0);
 		
-		if (restart_server > 0)
-		{
+		if (restart_server > 0) {
 			Reply = "%d citserver will now shut down and automatically restart.\n";
 		}
-		if ((restart_server > 0) && !running_as_daemon)
-		{
-			syslog(LOG_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n");
-			Reply = "%d Warning: citserver is not running in daemon mode and is therefore unlikely to restart automatically.\n";
-			state = ERROR;
-		}
 		cprintf(Reply, state);
 	}
-	else
-	{
+	else {
 		cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); 
 	}
 	CC->kill_me = KILLME_SERVER_SHUTTING_DOWN;
@@ -54,11 +40,8 @@ void cmd_down(char *argbuf) {
 }
 
 
-/*
- * Halt the server without exiting the server process.
- */
+// Halt the server without exiting the server process.
 void cmd_halt(char *argbuf) {
-
 	if (CtdlAccessCheck(ac_aide)) return;
 
 	cprintf("%d Halting server.  Goodbye.\n", CIT_OK);
@@ -67,11 +50,8 @@ void cmd_halt(char *argbuf) {
 }
 
 
-/*
- * Schedule or cancel a server shutdown
- */
-void cmd_scdn(char *argbuf)
-{
+// Schedule or cancel a server shutdown
+void cmd_scdn(char *argbuf) {
 	int new_state;
 	int state = CIT_OK;
 	char *Reply = "%d %d\n";
@@ -79,16 +59,8 @@ void cmd_scdn(char *argbuf)
 	if (CtdlAccessCheck(ac_aide)) return;
 
 	new_state = extract_int(argbuf, 0);
-	if ((new_state == 2) || (new_state == 3))
-	{
+	if ((new_state == 2) || (new_state == 3)) {
 		restart_server = 1;
-		if (!running_as_daemon)
-		{
-			syslog(LOG_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n");
-			Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n";
-			state = ERROR;
-		}
-
 		restart_server = extract_int(argbuf, 0);
 		new_state -= 2;
 	}
@@ -99,9 +71,9 @@ void cmd_scdn(char *argbuf)
 }
 
 
-/*****************************************************************************/
-/*                      MODULE INITIALIZATION STUFF                          */
-/*****************************************************************************/
+// ****************************************************************************
+// *                     MODULE INITIALIZATION STUFF                          *
+// ****************************************************************************
 
 CTDL_MODULE_INIT(syscmd)
 {
@@ -110,6 +82,6 @@ CTDL_MODULE_INIT(syscmd)
 		CtdlRegisterProtoHook(cmd_halt, "HALT", "halt the server without exiting the server process");
 		CtdlRegisterProtoHook(cmd_scdn, "SCDN", "schedule or cancel a server shutdown");
 	}
-        /* return our id for the Log */
+        // return our id for the log
 	return "syscmd";
 }