OK, it's more useful if this compiles...

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 6ea939e50180f90a4aa4105dd52907f860037946..71f4d7524d7ef00bf53eb803cdbab3889de54e1a 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -114,7 +114,9 @@ void                Module::OnUserDisconnect(User*) { }
 void           Module::OnUserJoin(User*, Channel*, bool, bool&) { }
 void           Module::OnPostJoin(User*, Channel*) { }
 void           Module::OnUserPart(User*, Channel*, std::string&, bool&) { }
-void           Module::OnRehash(User*, const std::string&) { }
+void           Module::OnPreRehash(User*, const std::string&) { }
+void           Module::OnModuleRehash(User*, const std::string&) { }
+void           Module::OnRehash(User*) { }
 int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
 void           Module::OnMode(User*, void*, int, const std::deque<std::string>&, const std::deque<TranslateType>&) { }
 Version                Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); }
@@ -395,13 +397,6 @@ bool ModuleManager::Load(const char* filename)
        snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
        std::string filename_str = filename;
 
-       if (!ServerConfig::DirValid(modfile))
-       {
-               LastModuleError = "Module " + std::string(filename) + " is not in the module directory that i am configured to look in (is "+Instance->Config->ModPath+" really a symlink?)";
-               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-               return false;
-       }
-
        if (!ServerConfig::FileExists(modfile))
        {
                LastModuleError = "Module file could not be found: " + filename_str;
@@ -771,11 +766,6 @@ void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringst
        User->WriteServ(CompleteLine);
 }
 
-User* FindDescriptorHandler::Call(int socket)
-{
-       return reinterpret_cast<User*>(Server->SE->GetRef(socket));
-}
-
 bool InspIRCd::AddResolver(Resolver* r, bool cached)
 {
        if (!cached)