X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=63e1118d93680efaa30d896062dd42c55a93800c;hb=5ad9b97fcff193ebce91a923c5006632501abf97;hp=7ac4d2062aa3657d278a726bd6eb1777c69fc928;hpb=645f7e18c64a6628ede880dc69bf8825ba93b375;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 7ac4d2062..63e1118d9 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -29,7 +29,6 @@
 #include "socket.h"
 #include "socketengine.h"
 #include "command_parse.h"
-#include "dns.h"
 #include "exitcodes.h"
 
 #ifndef _WIN32
@@ -97,7 +96,7 @@ void		Module::OnUserPart(Membership*, std::string&, CUList&) { }
 void		Module::OnPreRehash(User*, const std::string&) { }
 void		Module::OnModuleRehash(User*, const std::string&) { }
 void		Module::OnRehash(User*) { }
-ModResult	Module::OnUserPreJoin(User*, Channel*, const std::string&, std::string&, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreJoin(LocalUser*, Channel*, const std::string&, std::string&, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnMode(User*, void*, int, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
 void		Module::OnOper(User*, const std::string&) { }
 void		Module::OnPostOper(User*, const std::string&, const std::string &) { }
@@ -328,7 +327,7 @@ bool ModuleManager::CanUnload(Module* mod)
 {
 	std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
 
-	if (modfind == Modules.end() || modfind->second != mod)
+	if ((modfind == Modules.end()) || (modfind->second != mod) || (mod->dying))
 	{
 		LastModuleError = "Module " + mod->ModuleSourceFile + " is not loaded, cannot unload it!";
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
@@ -340,6 +339,8 @@ bool ModuleManager::CanUnload(Module* mod)
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
 		return false;
 	}
+
+	mod->dying = true;
 	return true;
 }
 
@@ -387,9 +388,6 @@ void ModuleManager::DoSafeUnload(Module* mod)
 
 	dynamic_reference_base::reset_all();
 
-	/* Tidy up any dangling resolvers */
-	ServerInstance->Res->CleanResolvers(mod);
-
 	DetachAll(mod);
 
 	Modules.erase(modfind);
@@ -568,18 +566,6 @@ void InspIRCd::SendGlobalMode(const std::vector<std::string>& parameters, User *
 		this->PI->SendMode(parameters[0], Modes->GetLastParseParams(), Modes->GetLastParseTranslate());
 }
 
-bool InspIRCd::AddResolver(Resolver* r, bool cached)
-{
-	if (!cached)
-		return this->Res->AddResolverClass(r);
-	else
-	{
-		r->TriggerCachedResult();
-		delete r;
-		return true;
-	}
-}
-
 Module* ModuleManager::Find(const std::string &name)
 {
 	std::map<std::string, Module*>::iterator modfind = Modules.find(name);