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

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index e7aef14515624f79ff52ef0d3d256bd5113ff906..a1211886176e05c90fdefa4140346ea498763b01 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.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.
@@ -80,6 +80,7 @@ bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string>
        params[4] = ":" + params[4];
        Utils->DoOneToAllButSender(prefix,"SERVER",params,prefix);
        this->ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")");
+       Node->bursting = true;
        return true;
 }
 
@@ -128,8 +129,7 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
-               if (!ComparePass(this->MakePass(x->RecvPass, this->GetOurChallenge()), password) &&
-                       (x->RecvPass != password && this->GetTheirChallenge().empty()))
+               if (!ComparePass(x->RecvPass, password))
                {
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str());
                        continue;
@@ -226,8 +226,7 @@ bool TreeSocket::Inbound_Server(std::deque<std::string> &params)
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
-               if (!ComparePass(this->MakePass(x->RecvPass, this->GetOurChallenge()), password) &&
-                       (x->RecvPass != password && this->GetTheirChallenge().empty()))
+               if (!ComparePass(x->RecvPass, password))
                {
                        this->ServerInstance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str());
                        continue;