Remove CMD_LOCALONLY, enforce use of GetRouting for routed commands

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

42 files changed, 122 insertions, 44 deletions

diff --git a/include/ctables.h b/include/ctables.h
index 95db50b1a..b57a29b4d 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -21,7 +21,6 @@ enum CmdResult
 	CMD_FAILURE = 0,	/* Command exists, but failed */
 	CMD_SUCCESS = 1,	/* Command exists, and succeeded */
 	CMD_INVALID = 2		/* Command doesnt exist at all! */
-#define CMD_LOCALONLY CMD_FAILURE
 };
 
 /** Translation types for translation of parameters to UIDs.
@@ -172,22 +171,18 @@ class CoreExport Command : public Extensible
 	 * @param parameters The parameters for the command.
 	 * @param user The user who issued the command.
 	 * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-	 * If the command succeeds but should remain local to this server,
-	 * return CMD_LOCALONLY.
 	 */
 	virtual CmdResult Handle(const std::vector<std::string>& parameters, User* user) = 0;
 
 	virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return ROUTE_BROADCAST;
+		return ROUTE_LOCALONLY;
 	}
 
 	/** Handle an internal request from another command, the core, or a module
 	 * @param Command ID
 	 * @param Zero or more parameters, whos form is specified by the command ID.
 	 * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-	 * If the command succeeds but should remain local to this server,
-	 * return CMD_LOCALONLY.
 	 */
 	virtual CmdResult HandleInternal(const unsigned int /* id */, const std::deque<classbase*>& /* params */)
 	{
@@ -199,8 +194,6 @@ class CoreExport Command : public Extensible
 	 * @param parameters The parameters given
 	 * @param servername The server name which issued the command
 	 * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure.
-	 * If the command succeeds but should remain local to this server,
-	 * return CMD_LOCALONLY.
 	 */
 	virtual CmdResult HandleServer(const std::vector<std::string>& /* parameters */, const std::string& /* servername */)
 	{
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 5f7c83f3c..063e18798 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -37,6 +37,11 @@ class CommandAlltime : public Command
 		/* we want this routed out! */
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 28c7f80f3..543f5d8a1 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -196,7 +196,7 @@ public:
 		{
 			if (IS_LOCAL(user))
 				ListAccept(user);
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else if (tok[0] == '-')
 		{
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index a38c9cc40..025540d9f 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -153,6 +153,11 @@ class CommandCBan : public Command
 
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleCBan : public Module
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 4c1c35257..41c2154cc 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -78,7 +78,7 @@ class CommandWebirc : public Command
 							ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str());
 						user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
 						user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
-						return CMD_LOCALONLY;
+						return CMD_SUCCESS;
 					}
 				}
 			}
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 8c3429d9b..407ef7ef3 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -51,7 +51,7 @@ class CommandClones : public Command
 
 		user->WriteServ(clonesstr + " END");
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 9514cd809..1da88c3d5 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -58,7 +58,7 @@ class CommandClose : public Command
 		else
 			user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 54dd9b0d0..b2933aa54 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -77,12 +77,12 @@ class CommandTitle : public Command
 
 				user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str());
 
-				return CMD_LOCALONLY;
+				return CMD_SUCCESS;
 			}
 		}
 
 		user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str());
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 
 };
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 2ba28d933..1348feeb3 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -64,7 +64,7 @@ class CommandCycle : public Command
 				Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
 			}
 
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else
 		{
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index cd43a4539..90c63e30d 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -199,6 +199,11 @@ class CommandDccallow : public Command
 		return CMD_FAILURE;
 	}
 
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
+
 	void DisplayHelp(User* user)
 	{
 		user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick.c_str());
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 0d511886c..ff85dbd67 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -43,7 +43,7 @@ class CommandDevoice : public Command
 
 			ServerInstance->SendMode(modes, ServerInstance->FakeClient);
 			ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 
 		return CMD_FAILURE;
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 36a8c4f95..b2986e436 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -112,6 +112,11 @@ class CommandFilter : public Command
 	{
 		user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick.c_str(), extra_text.c_str());
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class FilterBase : public Module
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 72c8a14d3..817e9cdfc 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -47,6 +47,11 @@ class CommandGloadmodule : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 /** Handle /GUNLOADMODULE
@@ -80,6 +85,11 @@ class CommandGunloadmodule : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 /** Handle /GRELOADMODULE
@@ -118,6 +128,11 @@ class CommandGreloadmodule : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleGlobalLoad : public Module
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 4c8b0e713..fafe19e6e 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -40,6 +40,11 @@ class CommandGlobops : public Command
 		/* route it (ofc :p) */
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleGlobops : public Module
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 6e8f00b44..d8492fd5e 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -55,7 +55,7 @@ class CommandJumpserver : public Command
 
 			port = 0;
 			redirect_to.clear();
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 
 		port = 0;
@@ -126,7 +126,7 @@ class CommandJumpserver : public Command
 					reason.c_str());
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index a13bd6a5c..718974908 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -65,6 +65,11 @@ class CommandKnock : public Command
 		user->WriteServ("NOTICE %s :KNOCKing on %s", user->nick.c_str(), c->name.c_str());
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 /** Handles channel mode +K
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 3dff80fdf..ce3ab4c2b 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -37,7 +37,7 @@ public:
 		user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
 		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
 		/* Dont send to the network */
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -59,7 +59,7 @@ public:
 		user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
 		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
 		/* Dont send to the network */
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 6267726ef..906d0d1f8 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -93,6 +93,11 @@ class CommandOjoin : public Command
 			return CMD_FAILURE;
 		}
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 /** Abstraction of NetworkPrefixBase for channel mode +Y
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index e3dafeff3..6eb3a0540 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -35,7 +35,7 @@ CmdResult ShowOperMOTD(User* user)
 	user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
 	/* don't route me */
-	return CMD_LOCALONLY;
+	return CMD_SUCCESS;
 }
 
 /** Handle /OPERMOTD
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index fcc910073..94134e45e 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -62,7 +62,7 @@ class CommandMkpasswd : public Command
 		// Slow down the user if they are trying to flood mkpasswd requests
 		user->IncreasePenalty(5);
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index a3c0e8d13..fcdfa0226 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -47,7 +47,7 @@ class CommandRandquote : public Command
 			return CMD_FAILURE;
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index b2ddd798d..007ac0246 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -182,6 +182,11 @@ class CommandRLine : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleRLine : public Module
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 584199345..e0e751e7b 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -34,7 +34,7 @@ class CommandSamode : public Command
 		if (ServerInstance->Modes->GetLastParse().length())
 			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " used SAMODE: " +ServerInstance->Modes->GetLastParse());
 		this->active = false;
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index a58d4dcdc..1436afa3d 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -209,6 +209,11 @@ class CommandSASL : public Command
 		}
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleSASL : public Module
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index dfe145051..542e8f30d 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -42,7 +42,7 @@ class CommandSATopic : public Command
 			ServerInstance->SNO->WriteToSnoMask('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 			ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else
 		{
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 8442167cf..8e397c0e1 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -53,7 +53,7 @@ class CommandSethost : public Command
 		if (user->ChangeDisplayedHost(parameters[0].c_str()))
 		{
 			ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 
 		return CMD_FAILURE;
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 03d5f69f9..64fd0a689 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -49,7 +49,7 @@ class CommandSetident : public Command
 		user->ChangeIdent(parameters[0].c_str());
 		ServerInstance->SNO->WriteGlobalSno('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str());
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 4954e14dd..17570d989 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -41,7 +41,7 @@ class CommandSetidle : public Command
 		ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds");
 		user->WriteNumeric(944, "%s :Idle time set.",user->nick.c_str());
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 6cd94c982..97bb1cfcf 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -46,7 +46,7 @@ class CommandSetname : public Command
 			return CMD_SUCCESS;
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 43359c28a..3a5901028 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -171,6 +171,11 @@ class CommandShun : public Command
 
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleShun : public Module
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index dd720608f..9cf9f6d4e 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -82,6 +82,11 @@ class CommandSVSSilence : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class CommandSilence : public Command
@@ -112,7 +117,7 @@ class CommandSilence : public Command
 			}
 			user->WriteNumeric(272, "%s :End of Silence List",user->nick.c_str());
 
-			return CMD_LOCALONLY;
+			return CMD_SUCCESS;
 		}
 		else if (parameters.size() > 0)
 		{
@@ -199,7 +204,7 @@ class CommandSilence : public Command
 				return CMD_SUCCESS;
 			}
 		}
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 
 	/* turn the nice human readable pattern into a mask */
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 2cf4fa3ad..1b1f618b8 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -68,10 +68,6 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 		Module* srcmodule = thiscmd->creator;
 		Version ver = srcmodule->GetVersion();
 
-		// XXX Temporary check to avoid routing cmd_* entries while they default to global routing
-		if (srcmodule->ModuleSourceFile[0] == 'c')
-			return;
-
 		if (!(ver.Flags & VF_COMMON))
 		{
 			ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 2afe8d4f8..7de539905 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -61,7 +61,6 @@ CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, Use
 			sock->Squit(server_target, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")");
 			ServerInstance->SE->DelFd(sock);
 			sock->Close();
-			return CMD_LOCALONLY;
 		}
 	}
 
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 0f1f04e99..715d9110a 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -45,7 +45,7 @@ class CommandSSLInfo : public Command
 					user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick.c_str(), cert->GetIssuer().c_str());
 					user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick.c_str(), cert->GetFingerprint().c_str());
 				}
-				return CMD_LOCALONLY;
+				return CMD_SUCCESS;
 			}
 			else
 			{
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 860774574..e8cd82806 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -139,6 +139,11 @@ class CommandSvshold : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleSVSHold : public Module
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index cf14be3e1..ebff25cb8 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -72,7 +72,7 @@ class CommandSwhois : public Command
 			delete text;
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 
 };
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index cab7f8f6e..17e9cd50e 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -107,6 +107,11 @@ class CommandTban : public Command
 		user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleTimedBans : public Module
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 0efd496c6..b08d5b6c0 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -55,7 +55,7 @@ class CommandTline : public Command
 		else
 			user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str());
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 733295029..0e9b991a0 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -74,6 +74,11 @@ class CommandUninvite : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleUninvite : public Module
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 75981b5cc..c58f4a73b 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -49,7 +49,7 @@ class CommandUserip : public Command
 			user->WriteServ(retbuf);
 
 		/* Dont send to the network */
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 419b51c9b..6c630622c 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -43,7 +43,7 @@ class CommandVhost : public Command
 					user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your VHost: " + mask);
 					user->ChangeDisplayedHost(mask.c_str());
 					delete Conf;
-					return CMD_LOCALONLY;
+					return CMD_SUCCESS;
 				}
 			}
 		}
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 1cda4484f..31edcc0e2 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -125,6 +125,11 @@ class CommandSVSWatch : public Command
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 /** Handle /WATCH
@@ -182,7 +187,7 @@ class CommandWatch : public Command
 			}
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 
 	CmdResult add_watch(User* user, const char* nick)
@@ -240,7 +245,7 @@ class CommandWatch : public Command
 			}
 		}
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 
 	CommandWatch (InspIRCd* Instance, Module* parent, unsigned int &maxwatch) : Command(Instance,parent,"WATCH",0,0), MAX_WATCH(maxwatch)
@@ -352,7 +357,7 @@ class CommandWatch : public Command
 				}
 			}
 		}
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };