X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=e8fe75177dd7836250bcbf06394b5c29774be000;hb=1a738eb97eb7ac62b7d28bd40b03969d175ee6e3;hp=8b02b954526f5d61bb553522777fd04598771543;hpb=50234923b292122bb19296952b947d55b1760c62;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 8b02b9545..e8fe75177 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -95,7 +95,8 @@ void TreeSocket::SendCapabilities()
 			" IP6SUPPORT="+ConvToStr(ip6support)+
 			" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+
 			" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
-			" CHANMODES="+ServerInstance->Modes->ChanModes()+
+			" CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
+			" USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+
 			" SVSPART=1");
 
 	this->WriteLine("CAPAB END");
@@ -186,9 +187,18 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
 		if(this->CapKeys.find("PREFIX") != this->CapKeys.end() && this->CapKeys.find("PREFIX")->second != this->ServerInstance->Modes->BuildPrefixes())
 			reason = "One or more of the prefixes on the remote server are invalid on this server.";
 
+		if(this->CapKeys.find("CHANMODES") != this->CapKeys.end() && this->CapKeys.find("CHANMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_CHANNEL))
+			reason = "One or more of the channel modes on the remote server are invalid on this server.";
+
+		if(this->CapKeys.find("USERMODES") != this->CapKeys.end() && this->CapKeys.find("USERMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_USER))
+			reason = "One or more of the user modes on the remote server are invalid on this server.";
+
+
 		if (((this->CapKeys.find("HALFOP") == this->CapKeys.end()) && (ServerInstance->Config->AllowHalfop)) || ((this->CapKeys.find("HALFOP") != this->CapKeys.end()) && (this->CapKeys.find("HALFOP")->second != ConvToStr(ServerInstance->Config->AllowHalfop))))
 			reason = "We don't both have halfop support enabled/disabled identically";
 
+
+
 		/* Challenge response, store their challenge for our password */
 		std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
 		if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))