cmd_commands Don't show server only commands to users

[user/henk/code/inspircd.git] / src / commands / cmd_restart.cpp

diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp
index 79dc27e4d898f4afd88fc69b07059bc526d38792..b94dbaac927fd2a1d149d0719718b3dc6a8aff4f 100644 (file)
--- a/src/commands/cmd_restart.cpp
+++ b/src/commands/cmd_restart.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /** Handle /RESTART
@@ -37,23 +44,16 @@ CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, Us
        {
                ServerInstance->SNO->WriteGlobalSno('a', "RESTART command from %s!%s@%s, restarting server.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 
-               try
-               {
-                       ServerInstance->Restart("Server restarting.");
-               }
-               catch (...)
-               {
-                       /* We dont actually get here unless theres some fatal and unrecoverable error. */
-                       exit(0);
-               }
+               ServerInstance->SendError("Server restarting.");
+               execv(ServerInstance->Config->cmdline.argv[0], ServerInstance->Config->cmdline.argv);
+               ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART - could not execute '%s' (%s)",
+                       ServerInstance->Config->cmdline.argv[0], strerror(errno));
        }
        else
        {
                ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s!%s@%s.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
-               return CMD_FAILURE;
        }
-
-       return CMD_SUCCESS;
+       return CMD_FAILURE;
 }