X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_oper_cert.cpp;h=6746a4afa2ea26e81210ee0ea6f0df1232cfb2ad;hb=b950e46bfeef5643ff68c8c78530c1eff25d024e;hp=3bbaa359e84bde36157d00eaa666e5dd88842cfa;hpb=df56d4697a529607a07e30158a7b43b277724870;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index 3bbaa359e..6746a4afa 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -20,7 +20,6 @@
 #include "channels.h"
 #include "modules.h"
 #include "transport.h"
-#include "wildcard.h"
 
 /** Handle /FINGERPRINT
  */
@@ -31,8 +30,8 @@ class cmd_fingerprint : public Command
 	{
 		this->source = "m_ssl_oper_cert.so";
 		syntax = "<nickname>";
-	}       
-	          
+	}
+
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		User* target = ServerInstance->FindNick(parameters[0]);
@@ -104,7 +103,7 @@ class ModuleOperSSLCert : public Module
 		std::string xhost;
 		while (hl >> xhost)
 		{
-			if (match(host, xhost) || match(ip, xhost, true))
+			if (InspIRCd::Match(host, xhost) || InspIRCd::MatchCIDR(ip, xhost))
 			{
 				return true;
 			}
@@ -112,10 +111,10 @@ class ModuleOperSSLCert : public Module
 		return false;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
 		irc::string cmd = command.c_str();
-		
+
 		if ((cmd == "OPER") && (validated))
 		{
 			char TheHost[MAXBUF];
@@ -129,7 +128,7 @@ class ModuleOperSSLCert : public Module
 			bool SSLOnly;
 			char* dummy;
 
-			snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host);
+			snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
 			snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
 
 			HasCert = user->GetExt("ssl_cert",cert);
@@ -169,7 +168,7 @@ class ModuleOperSSLCert : public Module
 				{
 					user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
 					ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
-					ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick.c_str(), user->ident.c_str(), user->host);
+					ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 					return 1;
 				}
 			}
@@ -181,7 +180,7 @@ class ModuleOperSSLCert : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };