Weed out a few leftover server instances from before modules had ServerInstance....

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 80aa494823296acf3027ff0298259a9d902db4f6..72fd66f95d8d03e268083945490a877ee366eb58 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -62,11 +62,6 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
                this->SendError("Invalid client introduction (Malformed MODE sequence?)");
                return false;
        }
-       else if (!ServerInstance->IsNick(parameters[0].c_str(), ServerInstance->Config->Limits.NickMax))
-       {
-               this->SendError("Invalid client introduction (Nickname was not valid according to me)");
-               return false;
-       }
 
        /* check for collision */
        user_hash::iterator iter = this->ServerInstance->Users->clientlist->find(params[2]);
@@ -76,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];