Fix crash on propogation after routed squit has reached it's destination. Thx HiroP.

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

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 81aae13755c21f50d0850d5bb5b320b1bdc9ffab..d98870425e49f8f593af1b206723c2e96ba628f3 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -10,14 +10,12 @@
  *
  * ---------------------------------------------------
  */
- 
+
+#include "inspircd.h" 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include <vector>
-#include "inspircd.h"
-
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
 
 class ModuleSecureList : public Module
@@ -26,7 +24,7 @@ class ModuleSecureList : public Module
        std::vector<std::string> allowlist;
        time_t WaitTime;
  public:
-       ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
+       ModuleSecureList(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL,"");
        }
@@ -44,8 +42,8 @@ class ModuleSecureList : public Module
        {
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowlist.clear();
-               for (int i = 0; i < MyConf->Enumerate("securelist"); i++)
-                       allowlist.push_back(MyConf->ReadValue("securelist", "exception", i));
+               for (int i = 0; i < MyConf->Enumerate("securehost"); i++)
+                       allowlist.push_back(MyConf->ReadValue("securehost", "exception", i));
                WaitTime = MyConf->ReadInteger("securelist", "waittime", "60", 0, true);
                DELETE(MyConf);
        }
@@ -65,7 +63,7 @@ class ModuleSecureList : public Module
                if (!validated)
                        return 0;
  
-               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!*user->oper))
+               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
                {
                        /* Normally wouldnt be allowed here, are they exempt? */
                        for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
@@ -118,7 +116,7 @@ class ModuleSecureListFactory : public ModuleFactory
  
 };
  
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleSecureListFactory;
 }