X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=5189ec141e36816b9d3eb3b4283c196137236d8c;hb=f1712e6f0b58098250791ffc60815fa3fc462607;hp=c327d27b32631780a54f8f665c2ac34714777738;hpb=1eb52771d6a7fe8768baf8bad509de0facafbd2c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index c327d27b3..5189ec141 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -28,7 +28,7 @@ class CommandChghost : public Command
 		syntax = "<nick> <newhost>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
- 
+
 	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
 		const char * x = parameters[1].c_str();
@@ -43,27 +43,33 @@ class CommandChghost : public Command
 		}
 		if (parameters[0].empty())
 		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick);
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick.c_str());
 			return CMD_FAILURE;
 		}
-		
+
 		if ((parameters[1].c_str() - x) > 63)
 		{
-			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick);
+			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str());
 			return CMD_FAILURE;
 		}
 		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
-			user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
 		}
 
-		if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server)))
+		if (IS_LOCAL(dest))
 		{
-			// fix by brain - ulines set hosts silently
-			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+			if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server)))
+			{
+				// fix by brain - ulines set hosts silently
+				ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+			}
+
+			/* ChangeDisplayedHost fixes it for us */
+			return CMD_LOCALONLY;
 		}
 
 		/* route it! */
@@ -88,7 +94,7 @@ class ModuleChgHost : public Module
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	
+
 	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
@@ -97,7 +103,7 @@ class ModuleChgHost : public Module
 		if (hmap.empty())
 			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
 
-		memset(&hostmap, 0, 255);
+		memset(hostmap, 0, sizeof(hostmap));
 		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
 			hostmap[(unsigned char)*n] = 1;
 	}
@@ -105,12 +111,12 @@ class ModuleChgHost : public Module
 	~ModuleChgHost()
 	{
 	}
-	
+
 	Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleChgHost)