X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_password_hash.cpp;h=011a592e7bab1cde54a8619b8180620f74ad83b1;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=761f52bc40d09df5722197b07869b717ad8448b6;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 761f52bc4..011a592e7 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -26,8 +26,7 @@ class CommandMkpasswd : public Command
 	hashymodules &hashers;
 	std::deque<std::string> &names;
  public:
-	CommandMkpasswd (InspIRCd* Instance, Module* Creator, hashymodules &h, std::deque<std::string> &n)
-		: Command(Instance, Creator, "MKPASSWD", 0, 2), hashers(h), names(n)
+	CommandMkpasswd(Module* Creator, hashymodules &h, std::deque<std::string> &n) : Command(Creator, "MKPASSWD", 2), hashers(h), names(n)
 	{
 		syntax = "<hashtype> <any-text>";
 	}
@@ -62,7 +61,7 @@ class CommandMkpasswd : public Command
 		// Slow down the user if they are trying to flood mkpasswd requests
 		user->IncreasePenalty(5);
 
-		return CMD_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -76,8 +75,8 @@ class ModuleOperHash : public Module
 	bool diduseiface; /* If we've called UseInterface yet. */
  public:
 
-	ModuleOperHash(InspIRCd* Me)
-		: Module(Me), cmd(Me, this, hashers, names)
+	ModuleOperHash()
+		: cmd(this, hashers, names)
 	{
 		diduseiface = false;
 
@@ -134,7 +133,7 @@ class ModuleOperHash : public Module
 		}
 	}
 
-	virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+	virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
 	{
 		/* First, lets see what hash theyre using on this oper */
 		hashymodules::iterator x = hashers.find(hashtype.c_str());
@@ -146,18 +145,19 @@ class ModuleOperHash : public Module
 			HashResetRequest(this, x->second).Send();
 			/* Compare the hash in the config to the generated hash */
 			if (!strcasecmp(data.c_str(), HashSumRequest(this, x->second, input.c_str()).Send()))
-				return 1;
+				return MOD_RES_ALLOW;
 			/* No match, and must be hashed, forbid */
-			else return -1;
+			else
+				return MOD_RES_DENY;
 		}
 
 		/* Not a hash, fall through to strcmp in core */
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
 	}
 };