Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

[user/henk/code/inspircd.git] / src / modules / m_chghost.cpp

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index cda13c97660e3e0e16caae7a98d701d4e6f81d78..0ca7dc78c97e12d18b18d42c60222a29f34b6e7b 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -33,11 +33,11 @@ class CommandChghost : public Command
        {
                allow_empty_last_param = false;
                flags_needed = 'o';
-               syntax = "<nick> <newhost>";
+               syntax = "<nick> <host>";
                TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost)
                {
@@ -47,7 +47,7 @@ class CommandChghost : public Command
 
                for (std::string::const_iterator x = parameters[1].begin(); x != parameters[1].end(); x++)
                {
-                       if (!hostmap.test(*x))
+                       if (!hostmap.test(static_cast<unsigned char>(*x)))
                        {
                                user->WriteNotice("*** CHGHOST: Invalid characters in hostname");
                                return CMD_FAILURE;
@@ -75,7 +75,7 @@ class CommandChghost : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_UCAST(parameters[0]);
        }
@@ -98,12 +98,12 @@ class ModuleChgHost : public Module
 
                cmd.hostmap.reset();
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
-                       cmd.hostmap.set(*n);
+                       cmd.hostmap.set(static_cast<unsigned char>(*n));
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
        }
 };