X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sqlauth.cpp;h=8a0b80ce1f9e38c4a102492ef1cb244d05237cff;hb=0e5fb98a6b82af738f6d5c3093d9597d470be3a6;hp=ba969e54dad9853340a3a7f0e09693927c6c84eb;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index ba969e54d..8a0b80ce1 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -20,6 +20,7 @@
 #include "inspircd.h"
 #include "modules/sql.h"
 #include "modules/hash.h"
+#include "modules/ssl.h"
 
 enum AuthState {
 	AUTH_STATE_NONE = 0,
@@ -81,13 +82,7 @@ class ModuleSQLAuth : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(pendingExt);
-		OnRehash(NULL);
-	}
-
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* conf = ServerInstance->Config->ConfValue("sqlauth");
 		std::string dbid = conf->getString("dbid");
@@ -129,11 +124,14 @@ class ModuleSQLAuth : public Module
 
 		HashProvider* md5 = ServerInstance->Modules->FindDataService<HashProvider>("hash/md5");
 		if (md5)
-			userinfo["md5pass"] = md5->hexsum(user->password);
+			userinfo["md5pass"] = md5->Generate(user->password);
 
 		HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
 		if (sha256)
-			userinfo["sha256pass"] = sha256->hexsum(user->password);
+			userinfo["sha256pass"] = sha256->Generate(user->password);
+
+		const std::string certfp = SSLClientCert::GetFingerprint(&user->eh);
+		userinfo["certfp"] = certfp;
 
 		SQL->submit(new AuthQuery(this, user->uuid, pendingExt, verbose), freeformquery, userinfo);