summaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree/uid.cpp
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-03-06 20:39:02 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-03-06 20:39:02 +0000
commiteacd707421be4f2612df9bde4517649061bb062e (patch)
treebfde92659d07a50783279a24cdbfcc3b274eea4a /src/modules/m_spanningtree/uid.cpp
parentf25f6319d5ae3eb1c48fcc84cb49c9cf08c439a5 (diff)
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
Diffstat (limited to 'src/modules/m_spanningtree/uid.cpp')
-rw-r--r--src/modules/m_spanningtree/uid.cpp4
1 files changed, 2 insertions, 2 deletions
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<std::string> &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];