X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=cf139f4a3d5dbe9032039dd18009e5ad872e3fff;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=ffb8f8e551f7ac0c11b792b17dc84a4580e460f6;hpb=01a1d67dd1406f99821c7c5f6e491373bbd96c74;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index ffb8f8e55..cf139f4a3 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -63,15 +63,18 @@ class RemoveBase : public Command
 		const std::string& username = parameters[neworder ? 1 : 0];
 
 		/* Look up the user we're meant to be removing from the channel */
-		target = ServerInstance->FindNick(username);
+		if (IS_LOCAL(user))
+			target = ServerInstance->FindNickOnly(username);
+		else
+			target = ServerInstance->FindNick(username);
 
 		/* And the channel we're meant to be removing them from */
 		channel = ServerInstance->FindChan(channame);
 
 		/* Fix by brain - someone needs to learn to validate their input! */
-		if (!target || !channel)
+		if ((!target) || (target->registered != REG_ALL) || (!channel))
 		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username.c_str() : channame.c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !channel ? channame.c_str() : username.c_str());
 			return CMD_FAILURE;
 		}