Opers are not exempt from other modes, don't exempt them from +N (we may add this...

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index e9cddcbbf91ac46020f2bb3b0bc561284315a983..0d719755a7b373748ce768ea6a5f3fc8a884aebe 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,70 +1,87 @@
-#include "globals.h"
-#include <dlfcn.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "configreader.h"
 #include "dynamic.h"
+#include <dlfcn.h>
+#include "inspircd.h"
 
+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;
+       }
 
-DLLManager::DLLManager( const char *fname )
-{
-    // Try to open the library now and get any error message.
-       
-       h=dlopen( fname, RTLD_NOW );
-       err=dlerror();
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
+       {
+               err = (char*)dlerror();
+               return;
+       }
 }
 
 DLLManager::~DLLManager()
 {
        // close the library if it isn't null
-       if( h!=0 )
-       dlclose(h);
+       if (h)
+               dlclose(h);
 }
 
 
-bool DLLManager::GetSymbol( 
-                          void **v,
-                          const 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 );
-       err=dlerror();
-           if( err==0 )
-                 return true;
-       else
-         return false;
+               dlerror(); // clear value
+               *v = dlsym(h, sym_name);
+               err = (char*)dlerror();
+               if (!*v || err)
+                       return false;
+       }
+       
+       if (err)
+       {
+               return false;
        }
        else
        {       
-        return false;
+               return true;
        }
-       
 }
 
-
-DLLFactoryBase::DLLFactoryBase(
-                              const char *fname,
-                              const char *factory=0
-                              ) : 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;
        
-       factory_func=0;
-       
-       if( LastError()==0 )
-       {               
-       GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+       if (!LastError())
+       {
+               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
+               {
+                       throw ModuleException("Missing init_module() entrypoint!");
+               }
        }
-       
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
 
-
-