Send SVSNICKs during nick collision to prevent servers that do not fully implement...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket2.cpp

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index c006344ba9bcc2b0c5bb88c717618395502b1426..22dcf293dc4927d1096d44b6735be192e48581ce 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -180,13 +180,6 @@ bool TreeSocket::ProcessLine(std::string &line)
 
                                Node = new TreeServer(this->Utils, this->ServerInstance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false);
 
-                               if (Node->DuplicateID())
-                               {
-                                       this->SendError("Server ID "+InboundSID+" already exists on the network!");
-                                       this->ServerInstance->SNO->WriteToSnoMask('l',"Server \2"+InboundServerName+"\2 being introduced from \2" + prefix + "\2 denied, server ID already exists on the network. Closing link.");
-                                       return false;
-                               }
-
                                Utils->TreeRoot->AddChild(Node);
                                params.clear();
                                params.push_back(InboundServerName);
@@ -603,9 +596,9 @@ bool TreeSocket::ProcessLine(std::string &line)
                                                if (collideret != 1)
                                                {
                                                        /*
-                                                        * Remote client lost, or both lost, parsing this nickchange would be
-                                                        * pointless, as the incoming client's server will soon recieve SVSNICK to
-                                                        * change its nick to its UID. :) -- w00t
+                                                        * Remote client lost, or both lost, parsing or passing on this
+                                                        * nickchange would be pointless, as the incoming client's server will
+                                                        * soon recieve SVSNICK to change its nick to its UID. :) -- w00t
                                                         */
                                                        return true;
                                                }