Attempt to revert r11734

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

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 761f52bc40d09df5722197b07869b717ad8448b6..61bc742c22ad40039e95538fecdd7b0b9c9902b0 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -26,8 +26,7 @@ class CommandMkpasswd : public Command
        hashymodules &hashers;
        std::deque<std::string> &names;
  public:
-       CommandMkpasswd (InspIRCd* Instance, Module* Creator, hashymodules &h, std::deque<std::string> &n)
-               : Command(Instance, Creator, "MKPASSWD", 0, 2), hashers(h), names(n)
+       CommandMkpasswd(Module* Creator, hashymodules &h, std::deque<std::string> &n) : Command(Creator, "MKPASSWD", 2), hashers(h), names(n)
        {
                syntax = "<hashtype> <any-text>";
        }
@@ -62,7 +61,7 @@ class CommandMkpasswd : public Command
                // Slow down the user if they are trying to flood mkpasswd requests
                user->IncreasePenalty(5);
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
@@ -77,7 +76,7 @@ class ModuleOperHash : public Module
  public:
 
        ModuleOperHash(InspIRCd* Me)
-               : Module(Me), cmd(Me, this, hashers, names)
+               : Module(Me), cmd(this, hashers, names)
        {
                diduseiface = false;
 
@@ -134,7 +133,7 @@ class ModuleOperHash : public Module
                }
        }
 
-       virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+       virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
        {
                /* First, lets see what hash theyre using on this oper */
                hashymodules::iterator x = hashers.find(hashtype.c_str());
@@ -146,13 +145,14 @@ class ModuleOperHash : public Module
                        HashResetRequest(this, x->second).Send();
                        /* Compare the hash in the config to the generated hash */
                        if (!strcasecmp(data.c_str(), HashSumRequest(this, x->second, input.c_str()).Send()))
-                               return 1;
+                               return MOD_RES_ALLOW;
                        /* No match, and must be hashed, forbid */
-                       else return -1;
+                       else
+                               return MOD_RES_DENY;
                }
 
                /* Not a hash, fall through to strcmp in core */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()