remote kill fixes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@559 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 3cd832b8929adcfd17c59854f010a00c6fddc3b6..dd79bd0a13b5be2f30100eb0acd8e35923d4402e 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -3916,10 +3916,10 @@ void handle_kill(char **parameters, int pcnt, userrec *user)
                        // remote kill
                        WriteOpers("*** Remote kill: %s!%s@%s (%s)",user->nick,u->nick,u->ident,u->host,parameters[1]);
                        sprintf(killreason,"[%s] Killed (%s (%s))",u->server,user->nick,parameters[1]);
-                       WriteCommonExcept(user,"QUIT :%s",killreason);
+                       WriteCommonExcept(u,"QUIT :%s",killreason);
                        // K token must go to ALL servers!!!
                        char buffer[MAXBUF];
-                               snprintf(buffer,MAXBUF,"K %s :%s",user->nick,killreason);
+                               snprintf(buffer,MAXBUF,"K %s %s :%s",user->nick,u->nick,killreason);
                        for (int j = 0; j < 255; j++)
                        {
                                if (servers[j] != NULL)
@@ -3931,7 +3931,7 @@ void handle_kill(char **parameters, int pcnt, userrec *user)
                                        }
                                }
                        }
-                       user_hash::iterator iter = clientlist.find(user->nick);
+                       user_hash::iterator iter = clientlist.find(u->nick);
                        if (iter != clientlist.end())
                        {
                                log(DEBUG,"deleting user hash value %d",iter->second);