X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sanick.cpp;h=0ce9338a43f4feff165e23a64416d80b37064536;hb=dc7927e17cffb2ee3c50ef9f037ed873d378f679;hp=5758bac64ec704654b9487eade6467e776bdb462;hpb=7775a195d9c417e52eaaf912ec51d62bf0fd9a54;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 5758bac64..0ce9338a4 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -37,29 +37,39 @@ class cmd_sanick : public command_t
 		syntax = "<nick> <new-nick>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		userrec* source = ServerInstance->FindNick(parameters[0]);
 		if (source)
 		{
-			if (ServerInstance->is_uline(source->server))
+			if (ServerInstance->ULine(source->server))
 			{
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-				return;
+				return CMD_FAILURE;
 			}
 			if (ServerInstance->IsNick(parameters[1]))
 			{
-				// FIX by brain: Cant use source->nick here because if it traverses a server link then
-				// source->nick becomes invalid as the object data moves in memory.
-				ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
-				if (!source->ForceNickChange(parameters[1]))
+				if (source->ForceNickChange(parameters[1]))
+				{
+					ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+					return CMD_SUCCESS;
+				}
+				else
 				{
 					/* We couldnt change the nick */
-					userrec::QuitUser(ServerInstance, source, "Nickname collision");
-					return;
+					ServerInstance->WriteOpers(std::string(user->nick)+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+					return CMD_FAILURE;
 				}
 			}
+			else
+			{
+				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+			}
+
+			return CMD_FAILURE;
 		}
+
+		return CMD_FAILURE;
 	}
 };