X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_restart.cpp;h=33627b5405049411f5e44b9262de0b1b48316282;hb=5613d701785b61e09a2327bdea41acdd25cb9ef5;hp=b94dbaac927fd2a1d149d0719718b3dc6a8aff4f;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp
index b94dbaac9..33627b540 100644
--- a/src/commands/cmd_restart.cpp
+++ b/src/commands/cmd_restart.cpp
@@ -29,8 +29,7 @@ class CommandRestart : public Command
 	 */
 	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
+	 * @param parameters The parameters to the command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
@@ -39,19 +38,35 @@ 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());
-	if (!ServerInstance->PassCompare(user, ServerInstance->Config->restartpass, parameters[0].c_str(), ServerInstance->Config->powerhash))
+	ServerInstance->Logs->Log("COMMAND", LOG_DEFAULT, "Restart: %s",user->nick.c_str());
+	if (ServerInstance->PassCompare(user, ServerInstance->Config->restartpass, parameters[0], 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());
 
 		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));
 	}
 	else
 	{
-		ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s!%s@%s.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+		ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s.", user->GetFullRealHost().c_str());
 	}
 	return CMD_FAILURE;
 }