X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=acb822fbfa169419b2021fca91b9c4d2c984b49e;hb=d494c188245e1c80c9556a6a7efafd6fe8f4f6de;hp=5007fe921b64340353ecd1a2e1deaa821458d4c1;hpb=65072d44f23804d85dd800c5ce6aa3548831142e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 5007fe921..acb822fbf 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -155,13 +155,13 @@ void TreeSocket::ProcessLine(std::string &line)
 					time_t delta = them - ServerInstance->Time();
 					if ((delta < -600) || (delta > 600))
 					{
-						ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta));
-						SendError("Your clocks are out by "+ConvToStr(abs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+						ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %ld seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",labs((long)delta));
+						SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
 						return;
 					}
 					else if ((delta < -30) || (delta > 30))
 					{
-						ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
+						ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %ld seconds. Please consider synching your clocks.", labs((long)delta));
 					}
 				}
 
@@ -445,23 +445,23 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 		 * On nick messages, check that the nick doesnt already exist here.
 		 * If it does, perform collision logic.
 		 */
+		bool callfnc = true;
 		User* x = ServerInstance->FindNickOnly(params[0]);
-		if ((x) && (x != who))
+		if ((x) && (x != who) && (x->registered == REG_ALL))
 		{
 			int collideret = 0;
 			/* x is local, who is remote */
 			collideret = this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
 			if (collideret != 1)
 			{
-				/*
-				 * Remote client lost, or both lost, parsing or passing on this
-				 * nickchange would be pointless, as the incoming client's server will
-				 * soon recieve SVSNICK to change its nick to its UID. :) -- w00t
-				 */
-				return;
+				// Remote client lost, or both lost, rewrite this nick change as a change to uuid before
+				// forwarding and don't call ForceNickChange() because DoCollision() has done it already
+				params[0] = who->uuid;
+				callfnc = false;
 			}
 		}
-		who->ForceNickChange(params[0].c_str());
+		if (callfnc)
+			who->ForceNickChange(params[0].c_str());
 		Utils->RouteCommand(route_back_again, command, params, who);
 	}
 	else