X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnetburst.cpp;h=1601cd6e653d61386d597f944794af909d62bd6e;hb=a02ed18a1a1ae42fd81452b6ca5809fc3430a04c;hp=704afdc42d96241103d225af32db398295c28d2e;hpb=4abc2ff167877be048707a8482015b0ffc88d345;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 704afdc42..1601cd6e6 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -31,7 +31,11 @@ void TreeSocket::DoBurst(TreeServer* s)
 	std::string name = s->GetName();
 	std::string burst = ":" + this->ServerInstance->Config->GetSID() + " BURST " +ConvToStr(ServerInstance->Time());
 	std::string endburst = ":" + this->ServerInstance->Config->GetSID() + " ENDBURST";
-	this->ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
+	this->ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).",
+		name.c_str(),
+		this->auth_fingerprint ? "SSL Fingerprint and " : "",
+		this->auth_challenge ? "challenge-response" : "plaintext password");
+	this->CleanNegotiationInfo();
 	this->WriteLine(burst);
 	/* send our version string */
 	this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" VERSION :"+this->ServerInstance->GetVersionString());
@@ -84,10 +88,11 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 	std::string buffer;
 	char list[MAXBUF];
 
-	size_t dlen, curlen;
-	dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu +%s", this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(),(unsigned long)c->age, c->ChanModes(true));
+	size_t curlen, headlen;
+	curlen = headlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu +%s :",
+		this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(), (unsigned long)c->age, c->ChanModes(true));
 	int numusers = 0;
-	char* ptr = list + dlen;
+	char* ptr = list + curlen;
 	bool looped_once = false;
 
 	CUList *ulist = c->GetUsers();
@@ -101,14 +106,16 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 
 		if ((curlen + modestr.length() + i->first->uuid.length() + 4) > 480)
 		{
+			// remove the final space
+			if (ptr[-1] == ' ')
+				ptr[-1] = '\0';
 			buffer.append(list).append("\r\n");
-			dlen = curlen = snprintf(list, MAXBUF, ":%s FJOIN %s %lu +%s", this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(), (unsigned long)c->age, c->ChanModes(true));
-			ptr = list + dlen;
+			curlen = headlen;
+			ptr = list + headlen;
 			numusers = 0;
 		}
 
-		// The first parameter gets a : before it
-		ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", modestr.c_str(), i->first->uuid.c_str());
+		ptrlen = snprintf(ptr, MAXBUF-curlen, "%s,%s ", modestr.c_str(), i->first->uuid.c_str());
 
 		looped_once = true;
 
@@ -121,7 +128,12 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 	// Okay, permanent channels will (of course) need this \r\n anyway, numusers check is if there
 	// actually were people in the channel (looped_once == true)
 	if (!looped_once || numusers > 0)
+	{
+		// remove the final space
+		if (ptr[-1] == ' ')
+			ptr[-1] = '\0';
 		buffer.append(list).append("\r\n");
+	}
 
 	int linesize = 1;
 	for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++)