Fix for bug #791, if an error is set treat this as 'could not get certificate'

[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 4d3a9da63dadca4a3df5fbcb8863652ba1390ced..68768bae662789e7dda748e1f1a750eb3f6be858 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -28,7 +28,7 @@ class CommandMkpasswd : public Command
        std::deque<std::string> &names;
  public:
        CommandMkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
-               : Command(Instance,"MKPASSWD", "o", 2), Sender(S), hashers(h), names(n)
+               : Command(Instance,"MKPASSWD", 0, 2), Sender(S), hashers(h), names(n)
        {
                this->source = "m_password_hash.so";
                syntax = "<hashtype> <any-text>";
@@ -45,6 +45,11 @@ class CommandMkpasswd : public Command
                        /* Now attempt to generate a hash */
                        user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick.c_str(), algo, stuff, HashSumRequest(Sender, x->second, stuff).Send() );
                }
+               else if (names.empty())
+               {
+                       /* same idea as bug #569 */
+                       user->WriteServ("NOTICE %s :No hash provider modules are loaded", user->nick.c_str());
+               }
                else
                {
                        /* I dont do flying, bob. */
@@ -55,11 +60,11 @@ class CommandMkpasswd : public Command
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                MakeHash(user, parameters[0].c_str(), parameters[1].c_str());
-               /* NOTE: Don't propagate this across the network!
-                * We dont want plaintext passes going all over the place...
-                * To make sure it goes nowhere, return CMD_FAILURE!
-                */
-               return CMD_FAILURE;
+               // this hashing could take some time, increasing server load.
+               // Slow down the user if they are trying to flood mkpasswd requests
+               user->IncreasePenalty(5);
+
+               return CMD_LOCALONLY;
        }
 };
 
@@ -155,7 +160,7 @@ class ModuleOperHash : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 };