X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_password_hash.cpp;h=4f7d9e4496dff34f21d90c298855ea4c63b4e8f7;hb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;hp=55741ee0b511183d7aadeca578c792a479e9b0f5;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 55741ee0b..4f7d9e449 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -18,10 +18,8 @@
  */
 
 
-/* $ModDesc: Allows for hashed oper passwords */
-
 #include "inspircd.h"
-#include "hash.h"
+#include "modules/hash.h"
 
 /* Handle /MKPASSWD
  */
@@ -42,15 +40,14 @@ class CommandMkpasswd : public Command
 			HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + type);
 			if (!hp)
 			{
-				user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str());
+				user->WriteNotice("Unknown hash type");
 				return;
 			}
 			std::string salt = ServerInstance->GenRandomStr(6, false);
 			std::string target = hp->hmac(salt, stuff);
 			std::string str = BinToBase64(salt) + "$" + BinToBase64(target, NULL, 0);
 
-			user->WriteServ("NOTICE %s :%s hashed password for %s is %s",
-				user->nick.c_str(), algo.c_str(), stuff.c_str(), str.c_str());
+			user->WriteNotice(algo + " hashed password for " + stuff + " is " + str);
 			return;
 		}
 		HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + algo);
@@ -58,12 +55,11 @@ class CommandMkpasswd : public Command
 		{
 			/* Now attempt to generate a hash */
 			std::string hexsum = hp->hexsum(stuff);
-			user->WriteServ("NOTICE %s :%s hashed password for %s is %s",
-				user->nick.c_str(), algo.c_str(), stuff.c_str(), hexsum.c_str());
+			user->WriteNotice(algo + " hashed password for " + stuff + " is " + hexsum);
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str());
+			user->WriteNotice("Unknown hash type");
 		}
 	}
 
@@ -84,17 +80,15 @@ class ModuleOperHash : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		/* Read the config file first */
 		OnRehash(NULL);
 
-		ServerInstance->AddCommand(&cmd);
-		Implementation eventlist[] = { I_OnPassCompare };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+	ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) CXX11_OVERRIDE
 	{
 		if (hashtype.substr(0,5) == "hmac-")
 		{
@@ -132,7 +126,7 @@ class ModuleOperHash : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows for hashed oper passwords",VF_VENDOR);
 	}