From db8d5f98d628f11899e1de58b67cb65a0fbf2457 Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Wed, 13 Apr 2016 11:46:35 +0200
Subject: m_spanningtree Allow IJOIN with lower TS

---
 src/modules/m_spanningtree/ijoin.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index 78e05db93..c2dbcf7f5 100644
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -38,12 +38,10 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, std::vector<std::string>&
 	}
 
 	bool apply_modes;
-	if (params.size() > 2)
+	if (params.size() > 3)
 	{
 		time_t RemoteTS = ServerCommand::ExtractTS(params[2]);
-		if (RemoteTS < chan->age)
-			throw ProtocolException("Attempted to lower TS via IJOIN. LocalTS=" + ConvToStr(chan->age));
-		apply_modes = ((params.size() > 3) && (RemoteTS == chan->age));
+		apply_modes = (RemoteTS <= chan->age);
 	}
 	else
 		apply_modes = false;
-- 
cgit v1.2.3