Show a better warning when certtool/openssl are missing.

[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 5855104def3ca8c37c6edcca156f9d374e9613cf..6aaed7831dd63e849fb0be1716fba2a97caa7879 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -32,6 +32,7 @@ class CommandChghost : public Command
  public:
        CommandChghost(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
        {
+               allow_empty_last_param = false;
                flags_needed = 'o';
                syntax = "<nick> <newhost>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
@@ -58,7 +59,8 @@ class CommandChghost : public Command
 
                User* dest = ServerInstance->FindNick(parameters[0]);
 
-               if (!dest)
+               // Allow services to change the host of unregistered users
+               if ((!dest) || ((dest->registered != REG_ALL) && (!ServerInstance->ULine(user->server))))
                {
                        user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
@@ -98,7 +100,7 @@ class ModuleChgHost : public Module
        void init()
        {
                OnRehash(NULL);
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }