summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-11-30 13:46:54 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-11-30 13:46:54 +0000
commit79d51f20eb6b96b2096751a636ad372e2380684f (patch)
tree31c693888791c1fdc041916c2d033ea55dd4b3ff
parent329f5301c88d6be885f2232414a60eb4ec77a563 (diff)
More collision fixes
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2055 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_spanningtree.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index ec34da6ed..faba676d9 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -562,12 +562,10 @@ class TreeSocket : public InspSocket
{
// nick collision
log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,ident.c_str(),host.c_str(),(unsigned long)age,(unsigned long)iter->second->age);
- if (age > iter->second->age)
- {
- Srv->QuitUser(iter->second,"Killed (Nickname collision from "+source+")");
- }
+ this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision");
+ return true;
}
-
+
clientlist[tempnick] = new userrec();
clientlist[tempnick]->fd = FD_MAGIC_NUMBER;
strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX);