Fix for bug #792 reported by recyclebin, do not attempt to ping local servers which...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / kill.cpp

diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp
index 3b33e4919fa024efac94eab71fc5b9c928dcd61f..ea5cca6fe88fe1c71b44cbca2fd7d602e19e767a 100644 (file)
--- a/src/modules/m_spanningtree/kill.cpp
+++ b/src/modules/m_spanningtree/kill.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -35,15 +35,17 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &
                /* Prepend kill source, if we don't have one */
                if (*(params[1].c_str()) != 'K')
                {
-                       TreeServer* ts = Utils->FindServer(prefix);
                        params[1] = "Killed (" + params[1] +")";
                }
                std::string reason = params[1];
                params[1] = ":" + params[1];
                Utils->DoOneToAllButSender(prefix,"KILL",params,prefix);
-               // NOTE: This is safe with kill hiding on, as RemoteKill is only reached if we have a server prefix.
-               // in short this is not executed for USERS.
-               who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick.c_str(), prefix.c_str(), reason.c_str());
+               TreeServer* src = Utils->FindServer(prefix);
+               if (src)
+               {
+                       // this shouldn't ever be null, but it doesn't hurt to check
+                       who->Write(":%s KILL %s :%s (%s)", src->GetName().c_str(), who->nick.c_str(), src->GetName().c_str(), reason.c_str());
+               }
                this->ServerInstance->Users->QuitUser(who, reason);
        }
        return true;