Last raft of compile fixes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7967 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 2 insertions, 4 deletions

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 1f07e047c..5fa2a25ae 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -402,7 +402,7 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
 	else
 	{
 		std::string forwardto = params[1];
-		if (forwardto == this->Instance->Config->GetSID() || forwardto == this->Instance->ServerName)
+		if (forwardto == Instance->Config->GetSID() || forwardto == Instance->Config->ServerName)
 		{
 			/*
 			 * this is a PONG for us
@@ -1547,7 +1547,7 @@ Old nickname collision logic..
 				{
 					// its not a user. Its either a server, or somethings screwed up.
 					if (Utils->IsServer(prefix))
-						target = this->Instance->Config->GetID();
+						target = this->Instance->Config->GetSID();
 					else
 						return true;
 				}
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 9ed42fd0b..dcce230ac 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -177,8 +177,6 @@ SpanningTreeUtilities::SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningT
 
 	lines_to_apply = 0;
 
-	ServerInstance->Log(DEBUG, "SpanningTreeUtilities: SID: %s", OurSID.c_str());
-
 	this->TreeRoot = new TreeServer(this, ServerInstance, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
 
 	modulelist* ml = ServerInstance->FindInterface("InspSocketHook");