X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_oper_hash.cpp;h=b4661741b52b9ce4e44341c62324be6aa78cae94;hb=fed58f5c25915d60d40c0f407914ff7381902f9d;hp=b1d80b7eba61060ff3054449122d357709751319;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index b1d80b7eb..b4661741b 100644
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -14,12 +14,10 @@
 /* $ModDesc: Allows for hashed oper passwords */
 /* $ModDep: m_hash.h */
 
-#include "inspircd_config.h"
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-
 #include "m_hash.h"
 
 typedef std::map<irc::string, Module*> hashymodules;
@@ -79,12 +77,12 @@ class ModuleOperHash : public Module
  public:
 
 	ModuleOperHash(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 
 		/* Read the config file first */
 		Conf = NULL;
-		OnRehash("");
+		OnRehash(NULL,"");
 
 		ServerInstance->UseInterface("HashRequest");
 
@@ -104,7 +102,6 @@ class ModuleOperHash : public Module
 				/* Build a map of them */
 				hashers[name.c_str()] = *m;
 				names.push_back(name);
-				ServerInstance->Log(DEBUG, "Found HashRequest interface: '%s' -> '%08x'", name.c_str(), *m);
 			}
 		}
 		else
@@ -126,7 +123,7 @@ class ModuleOperHash : public Module
 		List[I_OnRehash] = List[I_OnOperCompare] = 1;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		/* Re-read configuration file */
 		if (Conf)
@@ -163,27 +160,4 @@ class ModuleOperHash : public Module
 	}
 };
 
-
-class ModuleOperHashFactory : public ModuleFactory
-{
- public:
-	ModuleOperHashFactory()
-	{
-	}
-	
-	~ModuleOperHashFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperHash(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperHashFactory;
-}
+MODULE_INIT(ModuleOperHash)