X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_restart.cpp;h=174e660635f39863cdbd3df2171fda274c2c68a9;hb=8f27fefa75e2952e7ab8757eb9fe4af4586817f0;hp=dc5507548ac4c2564049e4933233b89161eb158c;hpb=569a742b9420b62a538c27fbd38a2bb8db6b9ca6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp
index dc5507548..174e66063 100644
--- a/src/commands/cmd_restart.cpp
+++ b/src/commands/cmd_restart.cpp
@@ -39,12 +39,28 @@ class CommandRestart : public Command
 
 CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	ServerInstance->Logs->Log("COMMAND",DEFAULT,"Restart: %s",user->nick.c_str());
+	ServerInstance->Logs->Log("COMMAND",LOG_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, restarting server.", user->GetFullRealHost().c_str());
 
 		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;)
+		{
+			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));