Fix /who on opers incorrectly showing +i opers to

[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 b94dbaac927fd2a1d149d0719718b3dc6a8aff4f..bdbcfed35d314069b8355917dd0d502b960a5ae9 100644 (file)
--- a/src/commands/cmd_restart.cpp
+++ b/src/commands/cmd_restart.cpp
@@ -42,16 +42,32 @@ CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, Us
        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());
 
                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;
 }