X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=256a3d069baae8ee6d7fba78ccfbcda543ccd768;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=7f9f9edb7b4575b753c24f7f20c3b5b7df3b9bc5;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 7f9f9edb7..256a3d069 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -98,7 +98,7 @@ static std::string BuildModeList(ModeType type)
 		modes.push_back(mdesc);
 	}
 	std::sort(modes.begin(), modes.end());
-	return irc::stringjoiner(modes);
+	return stdalgo::string::join(modes);
 }
 
 void TreeSocket::SendCapabilities(int phase)
@@ -163,9 +163,12 @@ void TreeSocket::SendCapabilities(int phase)
 		extra = " CHALLENGE=" + this->GetOurChallenge();
 	}
 
-	// 2.0 needs this key
+	// 2.0 needs these keys.
 	if (proto_version == 1202)
+	{
 		extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion));
+		extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal));
+	}
 
 	this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
 			":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
@@ -175,7 +178,7 @@ void TreeSocket::SendCapabilities(int phase)
 			" MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+
 			" MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+
 			" MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+
-			" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
+			" MAXREAL="+ConvToStr(ServerInstance->Config->Limits.MaxReal)+
 			" MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
 			" MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+
 			extra+
@@ -221,7 +224,7 @@ void TreeSocket::ListDifference(const std::string &one, const std::string &two,
 	}
 }
 
-bool TreeSocket::Capab(const parameterlist &params)
+bool TreeSocket::Capab(const CommandBase::Params& params)
 {
 	if (params.size() < 1)
 	{
@@ -425,7 +428,7 @@ bool TreeSocket::Capab(const parameterlist &params)
 	}
 	else if ((params[0] == "CAPABILITIES") && (params.size() == 2))
 	{
-		irc::tokenstream capabs(params[1]);
+		irc::spacesepstream capabs(params[1]);
 		std::string item;
 		while (capabs.GetToken(item))
 		{