From eacd707421be4f2612df9bde4517649061bb062e Mon Sep 17 00:00:00 2001 From: danieldg Date: Fri, 6 Mar 2009 20:39:02 +0000 Subject: Send SVSNICKs during nick collision to prevent servers that do not fully implement collisions from killing users git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11179 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/uid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/m_spanningtree/uid.cpp') diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 749922c62..58a4a0e9d 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -71,10 +71,10 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque &pa /* * Nick collision. */ - ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str()); int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]); + ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide); - if (collide == 2) + if (collide != 1) { /* remote client changed, make sure we change their nick for the hash too */ params[2] = params[0]; -- cgit v1.3.1-10-gc9f91