Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

[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 3dadf64f6eaf32f8e56b0fdaa617e223366b62f3..40e12b03a1302b5ffb02c0bff09a0cc4656ebe87 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -22,13 +22,11 @@
 
 #include "m_spanningtree/main.h"
 #include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
 #include "m_spanningtree/link.h"
+#include "m_spanningtree/treeserver.h"
 #include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/link.h */
 
 /*
  * Some server somewhere in the network introducing another server.
@@ -133,7 +131,7 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
                if (!ComparePass(this->MakePass(x->RecvPass, this->GetOurChallenge()), password) &&
                        (x->RecvPass != password && this->GetTheirChallenge().empty()))
                {
-                       this->Instance->SNO->WriteToSnoMask('l',"Invalid password on link: %s %s %s", x->Name.c_str(), x->RecvPass.c_str(), password.c_str());
+                       this->Instance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str());
                        continue;
                }
 
@@ -177,7 +175,7 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> &params)
                return true;
        }
 
-       this->SendError("Invalid credentials");
+       this->SendError("Invalid credentials (check the other server's linking snomask for more information)");
        this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
        return false;
 }