Drop and log unknown nicks in FJOIN, rather than aborting the link

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5147 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 2 insertions, 25 deletions

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 679dc00df..d980cba21 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -1636,11 +1636,8 @@ class TreeSocket : public InspSocket
 				}
 				else
 				{
-					for (unsigned int f = 2; f < modectr; f++)
-						free(mode_users[f]);
-
-					this->WriteLine("ERROR :Invalid user '"+std::string(usr)+"' in FJOIN to '"+channel+"'");
-					return false;
+					ServerInstance->Log(SPARSE,"Warning! Invalid user %s in FJOIN to channel %s IGNORED", who->nick, channel.c_str());
+					continue;
 				}
 			}
 		}
@@ -1682,26 +1679,6 @@ class TreeSocket : public InspSocket
 		return true;
 	}
 
-	bool SyncChannelTS(std::string source, std::deque<std::string> &params)
-	{
-		if (params.size() >= 2)
-		{
-			chanrec* c = this->Instance->FindChan(params[0]);
-			if (c)
-			{
-				time_t theirTS = atoi(params[1].c_str());
-				time_t ourTS = c->age;
-				if (ourTS >= theirTS)
-				{
-					ServerInstance->Log(DEBUG,"Updating timestamp for %s, our timestamp was %lu and theirs is %lu",c->name,ourTS,theirTS);
-					c->age = theirTS;
-				}
-			}
-		}
-		DoOneToAllButSender(this->Instance->Config->ServerName,"SYNCTS",params,source);
-		return true;
-	}
-
 	/* NICK command */
 	bool IntroduceClient(std::string source, std::deque<std::string> &params)
 	{