X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=cb32ede78e6cd950266f6a1ed69db5b562a37f6f;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=8ce1ce37c4b26617b38d2ddaefea5d0764f71d27;hpb=63d3e056b742598f48ba9a8df216b06117a37910;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 8ce1ce37c..cb32ede78 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -51,8 +51,8 @@ class DNSBLResolver : public Resolver
 
  public:
 
-	DNSBLResolver(Module *me, InspIRCd *Instance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
-		: Resolver(Instance, hostname, DNS_QUERY_A, cached, me)
+	DNSBLResolver(Module *me, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
+		: Resolver(hostname, DNS_QUERY_A, cached, me)
 	{
 		theirfd = userfd;
 		them = u;
@@ -125,7 +125,7 @@ class DNSBLResolver : public Resolver
 						}
 						case DNSBLConfEntry::I_KLINE:
 						{
-							KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+							KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
 									"*", them->GetIPString());
 							if (ServerInstance->XLines->AddLine(kl,NULL))
 							{
@@ -139,7 +139,7 @@ class DNSBLResolver : public Resolver
 						}
 						case DNSBLConfEntry::I_GLINE:
 						{
-							GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+							GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
 									"*", them->GetIPString());
 							if (ServerInstance->XLines->AddLine(gl,NULL))
 							{
@@ -153,7 +153,7 @@ class DNSBLResolver : public Resolver
 						}
 						case DNSBLConfEntry::I_ZLINE:
 						{
-							ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+							ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
 									them->GetIPString());
 							if (ServerInstance->XLines->AddLine(zl,NULL))
 							{
@@ -215,8 +215,7 @@ class ModuleDNSBL : public Module
 		return DNSBLConfEntry::I_UNKNOWN;
 	}
  public:
-	ModuleDNSBL(InspIRCd *Me) : Module(Me)
-	{
+	ModuleDNSBL() 	{
 		ReadConf();
 		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnStats };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
@@ -229,7 +228,7 @@ class ModuleDNSBL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides handling of DNS blacklists", VF_VENDOR, API_VERSION);
 	}
 
 
@@ -246,7 +245,7 @@ class ModuleDNSBL : public Module
 	 */
 	virtual void ReadConf()
 	{
-		ConfigReader *MyConf = new ConfigReader(ServerInstance);
+		ConfigReader *MyConf = new ConfigReader;
 		ClearEntries();
 
 		for (int i=0; i< MyConf->Enumerate("dnsbl"); i++)
@@ -358,7 +357,7 @@ class ModuleDNSBL : public Module
 
 				/* now we'd need to fire off lookups for `hostname'. */
 				bool cached;
-				DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i, cached);
+				DNSBLResolver *r = new DNSBLResolver(this, hostname, user, user->GetFd(), *i, cached);
 				ServerInstance->AddResolver(r, cached);
 			}
 		}