X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=60146c78b1258e5eda99f3015593baa2cec9dc8b;hb=a86e320ac19fbbd6034d0447f048beb8b4a0ad1d;hp=3a637f9d0f7d6c8a99d3b166defed713dce33a0f;hpb=f2db4b743f0df9b9e588979fd0fcf2815e54af44;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 3a637f9d0..60146c78b 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -56,9 +56,10 @@ class CommandChghost : public Command
 
 		User* dest = ServerInstance->FindNick(parameters[0]);
 
-		if ((!dest) || (dest->registered != REG_ALL))
+		// Allow services to change the host of unregistered users
+		if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsULine())))
 		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			return CMD_FAILURE;
 		}
 
@@ -76,10 +77,7 @@ class CommandChghost : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		User* dest = ServerInstance->FindNick(parameters[0]);
-		if (dest)
-			return ROUTE_OPT_UCAST(dest->server);
-		return ROUTE_LOCALONLY;
+		return ROUTE_OPT_UCAST(parameters[0]);
 	}
 };