X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_restart.cpp;h=bdbcfed35d314069b8355917dd0d502b960a5ae9;hb=886f1ba488a5ab9d7fe4d7b4ac6b9c9dc2841738;hp=ffd0323b7c23a21322227077820a8c2fb5e6c48a;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp
index ffd0323b7..bdbcfed35 100644
--- a/src/commands/cmd_restart.cpp
+++ b/src/commands/cmd_restart.cpp
@@ -1,40 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 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"
-
-#ifndef __CMD_RESTART_H__
-#define __CMD_RESTART_H__
-
-// include the common header files
 
-#include <string>
-#include <deque>
-#include <vector>
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 
-/** Handle /RESTART. These command handlers can be reloaded by the core,
- * and handle basic RFC1459 commands. Commands within modules work
- * the same way, however, they can be fully unloaded, where these
- * may not.
+/** Handle /RESTART
  */
 class CommandRestart : public Command
 {
  public:
 	/** Constructor for restart.
 	 */
-	CommandRestart (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"RESTART","o",1,false,0) { syntax = "<password>"; }
+	CommandRestart(Module* parent) : Command(parent,"RESTART",1,1) { flags_needed = 'o'; syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
@@ -44,33 +37,39 @@ class CommandRestart : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	ServerInstance->Logs->Log("COMMAND",DEFAULT,"Restart: %s",user->nick.c_str());
 	if (!ServerInstance->PassCompare(user, ServerInstance->Config->restartpass, parameters[0].c_str(), ServerInstance->Config->powerhash))
 	{
-		ServerInstance->SNO->WriteGlobalSno('a', "RESTART command from %s!%s@%s, restarting server.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+		ServerInstance->SNO->WriteGlobalSno('a', "RESTART command from %s, restarting server.", user->GetFullRealHost().c_str());
 
-		try
-		{
-			ServerInstance->Restart("Server restarting.");
-		}
-		catch (...)
+		ServerInstance->SendError("Server restarting.");
+
+#ifndef _WIN32
+		/* XXX: This hack sets FD_CLOEXEC on all possible file descriptors, so they're closed if the execv() below succeeds.
+		 * Certainly, this is not a nice way to do things and it's slow when the fd limit is high.
+		 *
+		 * A better solution would be to set the close-on-exec flag for each fd we create (or create them with O_CLOEXEC),
+		 * however there is no guarantee that third party libs will do the same.
+		 */
+		for (int i = getdtablesize(); --i > 2;)
 		{
-			/* We dont actually get here unless theres some fatal and unrecoverable error. */
-			exit(0);
+			int flags = fcntl(i, F_GETFD);
+			if (flags != -1)
+				fcntl(i, F_SETFD, flags | FD_CLOEXEC);
 		}
+#endif
+
+		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;
+		ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s.", user->GetFullRealHost().c_str());
 	}
-
-	return CMD_SUCCESS;
+	return CMD_FAILURE;
 }