X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=1ec9879ae98ab7ecdddec399fe2abb3e83e185ab;hb=db7a49b071134cf3deadf05ce84fa6c7c46d80bf;hp=1c6939220629d1b8eb0b2b53a6a14675133be0a6;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 1c6939220..1ec9879ae 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -24,7 +24,7 @@
 /* $ModDesc: Provides handling of DNS blacklists */
 
 /* Class holding data for a single entry */
-class DNSBLConfEntry
+class DNSBLConfEntry : public classbase
 {
 	public:
 		enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE };
@@ -108,7 +108,7 @@ class DNSBLResolver : public Resolver
 					{
 						case DNSBLConfEntry::I_KILL:
 						{
-							User::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
+							ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")");
 							break;
 						}
 						case DNSBLConfEntry::I_KLINE:
@@ -143,7 +143,7 @@ class DNSBLResolver : public Resolver
 							{
 								ServerInstance->XLines->ApplyLines();
 							}
-							else 
+							else
 								delete zl;
 							break;
 						}
@@ -156,7 +156,7 @@ class DNSBLResolver : public Resolver
 
 					if (show)
 					{
-						ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
+						ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), bitmask);
 					}
 				}
 				else
@@ -212,7 +212,7 @@ class ModuleDNSBL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
 
@@ -247,7 +247,7 @@ class ModuleDNSBL : public Module
 			}
 			else
 			{
-				memset(e->records, 0, 256);
+				memset(e->records, 0, sizeof(e->records));
 				e->type = DNSBLConfEntry::A_RECORD;
 				irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false);
 				long item = -1;
@@ -257,7 +257,7 @@ class ModuleDNSBL : public Module
 
 			e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i));
 			e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i));
-			
+
 			/* Use portparser for record replies */
 
 			/* yeah, logic here is a little messy */
@@ -360,26 +360,26 @@ class ModuleDNSBL : public Module
 		/* don't do anything with this hot potato */
 		return 0;
 	}
-	
+
 	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		if (symbol != 'd')
 			return 0;
-		
+
 		unsigned long total_hits = 0, total_misses = 0;
 
 		for (std::vector<DNSBLConfEntry*>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
 		{
 			total_hits += (*i)->stats_hits;
 			total_misses += (*i)->stats_misses;
-			
+
 			results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
 					ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
 		}
-		
+
 		results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
 		results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
-		
+
 		return 0;
 	}
 };