DOH! Fix my muppetry of a segfault, and fix some warnings

[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 4762026164747344e6b926eeff846096ea630d25..68ed39c4d5e844354bcfbda183c331aaa610e4c1 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -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", "o", 2), Sender(S), hashers(h), names(n)
        {
                this->source = "m_password_hash.so";
                syntax = "<hashtype> <any-text>";
@@ -52,7 +52,7 @@ class CommandMkpasswd : public Command
                }
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                MakeHash(user, parameters[0], parameters[1]);
                /* NOTE: Don't propagate this across the network!
@@ -67,18 +67,19 @@ class ModuleOperHash : public Module
 {
        
        CommandMkpasswd* mycommand;
-       ConfigReader* Conf;
        hashymodules hashers; /* List of modules which implement HashRequest */
        std::deque<std::string> names; /* Module names which implement HashRequest */
 
+       bool diduseiface; /* If we've called UseInterface yet. */
  public:
 
        ModuleOperHash(InspIRCd* Me)
                : Module(Me)
        {
+               diduseiface = false;
 
                /* Read the config file first */
-               Conf = NULL;
+//             Conf = NULL;
                OnRehash(NULL,"");
 
                /* Find all modules which implement the interface 'HashRequest' */
@@ -98,33 +99,37 @@ class ModuleOperHash : public Module
                                hashers[name.c_str()] = *m;
                                names.push_back(name);
                        }
-               }
-               else
-               {
-                       throw ModuleException("I can't find any modules loaded which implement the HashRequest interface! You probably forgot to load a hashing module such as m_md5.so or m_sha256.so.");
+                       /* UseInterface doesn't do anything if there are no providers, so we'll have to call it later if a module gets loaded later on. */
+                       ServerInstance->Modules->UseInterface("HashRequest");
+                       diduseiface = true;
                }
 
-               ServerInstance->Modules->UseInterface("HashRequest");
-
                mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names);
                ServerInstance->AddCommand(mycommand);
-               Implementation eventlist[] = { I_OnRehash, I_OnPassCompare };
+               Implementation eventlist[] = { I_OnPassCompare, I_OnLoadModule };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
        
        virtual ~ModuleOperHash()
        {
-               ServerInstance->Modules->DoneWithInterface("HashRequest");
+               if (diduseiface) ServerInstance->Modules->DoneWithInterface("HashRequest");
        }
 
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnLoadModule(Module* mod, const std::string& name)
        {
-               /* Re-read configuration file */
-               if (Conf)
-                       delete Conf;
-
-               Conf = new ConfigReader(ServerInstance);
+               if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest"))
+               {
+                       ServerInstance->Logs->Log("m_password-hash",DEBUG, "Post-load registering hasher: %s", name.c_str());
+                       std::string sname = HashNameRequest(this, mod).Send();
+                       hashers[sname.c_str()] = mod;
+                       names.push_back(sname);
+                       if (!diduseiface)
+                       {
+                               ServerInstance->Modules->UseInterface("HashRequest");
+                               diduseiface = true;
+                       }
+               }
        }
 
        virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
@@ -150,7 +155,7 @@ class ModuleOperHash : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
 };