From f8c3d6d7625f8a2fee220a66040db79ab62b9516 Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 20 Aug 2007 17:11:22 +0000 Subject: backport of fix for bug #382. When colliding a nick, we didnt have : before the kill reasons for the serverkill. Because of a recentish refactor of server to server kills, when killing the user, the kill handler checks for params != 2 and returns if this is true Because 'nick collision' is two words, long, it ignores the KILL and risks a desync (basically a race condition). Couldnt duplicate myself, but this *SHOULD* fix. git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@7773 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/treesocket2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 333477255..fc4dd0215 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -1428,11 +1428,11 @@ bool TreeSocket::ProcessLine(std::string &line) { std::deque p; p.push_back(params[0]); - p.push_back("Nickname collision ("+prefix+" -> "+params[0]+")"); + p.push_back(":Nickname collision ("+prefix+" -> "+params[0]+")"); Utils->DoOneToMany(this->Instance->Config->ServerName,"KILL",p); p.clear(); p.push_back(prefix); - p.push_back("Nickname collision"); + p.push_back(":Nickname collision"); Utils->DoOneToMany(this->Instance->Config->ServerName,"KILL",p); userrec::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")"); userrec* y = this->Instance->FindNick(prefix); -- cgit v1.3.1-10-gc9f91