Made remote kill safer

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 9fed5da6075491ca5beca6665d1a03e8a547f070..53d5bb014bf0de14eeef17897dc9b1daad586132 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -1203,19 +1203,20 @@ class TreeSocket : public InspSocket
                userrec* who = Srv->FindNick(nick);
                if (who)
                {
-                       /* Append kill source, if we don't have one */
-                       if (*(params[1].c_str()) != '[')
-                       {
-                               params[1] = "[" + std::string(u->server) + "] Killed (" + params[1] +")";
-                       }
+                       /* Prepend kill source, if we don't have one */
                        std::string sourceserv = prefix;
                        if (u)
                        {
                                sourceserv = u->server;
                        }
+                       if (*(params[1].c_str()) != '[')
+                       {
+                               params[1] = "[" + sourceserv + "] Killed (" + params[1] +")";
+                       }
+                       std::string reason = params[1];
                        params[1] = ":" + params[1];
                        DoOneToAllButSender(prefix,"KILL",params,sourceserv);
-                       Srv->QuitUser(who,params[1]);
+                       Srv->QuitUser(who,reason);
                }
                return true;
        }