Add <securelist:exception> to allow certain masks to get around securelist.

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index c26df56b23cabd36c7b5de994dbe12d9beb81684..3d2d15b4f4cb3c65ae8a338931d0a996e4259758 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,22 +2,16 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "globals.h"
-#include "inspircd_config.h"
+#include "configreader.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
@@ -26,20 +20,23 @@ using namespace std;
 #include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
-DLLManager::DLLManager(char *fname)
+DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
+       err = NULL;
+
+       if (!strstr(fname,".so"))
+       {
+               err = "This doesn't look like a module file to me...";
+               return;
+       }
 #ifdef STATIC_LINK
        this->staticname[0] = '\0';
-       log(DEBUG,"Loading core-compiled module '%s'",fname);
        for (int j = 0; modsyms[j].name; j++)
        {
-               log(DEBUG,"Check %s",modsyms[j].name);
                if (!strcmp(modsyms[j].name,fname))
                {
-                       log(DEBUG,"Found %s",fname);
                        strlcpy(this->staticname,fname,1020);
                        err = 0;
                        return;
@@ -47,10 +44,12 @@ DLLManager::DLLManager(char *fname)
        }
        err = "Module is not statically compiled into the ircd";
 #else
-    // Try to open the library now and get any error message.
-       
-       h = dlopen( fname, RTLD_NOW );
-       err = (char*)dlerror();
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
+       {
+               err = (char*)dlerror();
+               return;
+       }
 #endif
 }
 
@@ -58,8 +57,8 @@ DLLManager::~DLLManager()
 {
 #ifndef STATIC_LINK
        // close the library if it isn't null
-       if (h != 0)
-       dlclose(h);
+       if (h)
+               dlclose(h);
 #endif
 }
 
@@ -67,14 +66,12 @@ DLLManager::~DLLManager()
 
 #ifdef STATIC_LINK
 
-bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
+bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 {
-       log(DEBUG,"Symbol search...");
        for (int j = 0; modsyms[j].name; j++)
        {
                if (!strcmp(this->staticname,modsyms[j].name))
                {
-                       log(DEBUG,"Loading symbol...");
                        v = modsyms[j].value;
                        err = 0;
                        return true;
@@ -86,45 +83,51 @@ bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
 
 #else
 
-bool DLLManager::GetSymbol(void **v, char *sym_name)
+bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
        // try extract a symbol from the library
        // get any error message is there is any
        
-       if(h != 0)
+       if (h)
        {
-               *v = dlsym( h, sym_name );
+               dlerror(); // clear value
+               *v = dlsym(h, sym_name);
                err = (char*)dlerror();
-               if( err == 0 )
-                       return true;
-               else
+               if (!*v || err)
                        return false;
        }
+       
+       if (err)
+       {
+               return false;
+       }
        else
        {       
-               return false;
+               return true;
        }
 }
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
 {
        // try get the factory function if there is no error yet
-       
        factory_func = 0;
        
-       if(LastError() == 0)
+       if (!LastError())
        {
 #ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : "init_module" );
+               if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
 #else
-               GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
 #endif
+               {
+                       throw ModuleException("Missing init_module() entrypoint!");
+               }
        }
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
+