Server restart via command no longer requires running as a daemon , uses execv()...

diff --git a/citadel/modules/ctdlproto/serv_syscmds.c b/citadel/modules/ctdlproto/serv_syscmds.c
index 013e1408902aa9aef626a50ceed29f86347eb26a..7341ad238c0e6dc82225b18f56358b3a7fa26f60 100644 (file)
--- a/citadel/modules/ctdlproto/serv_syscmds.c
+++ b/citadel/modules/ctdlproto/serv_syscmds.c
@@ -79,16 +79,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;
        }

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 8c4f6374184ef380a508810eebe3d4bb934b2704..9bd9be89e8ebfd21468f6bc1a95b2ad5f6a61604 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -358,5 +358,8 @@ int main(int argc, char **argv)
        
        int exit_code = master_cleanup(exit_signal);
        ctdl_lockfile(0);
+       if (restart_server) {
+               execv(argv[0], argv);
+       }
        return(exit_code);
 }