Merge pull request #1084 from SaberUK/insp20+fix-parallel-debug-install

[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 c13e1a8928fa3bf6a878c90ce50d8b0968299f5e..6013d1fd7543400bfcadf0a4f55f1269f8b058ad 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -21,7 +21,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
 
 class ModuleSecureList : public Module
 {
@@ -29,10 +29,11 @@ class ModuleSecureList : public Module
        std::vector<std::string> allowlist;
        time_t WaitTime;
  public:
-       ModuleSecureList()      {
+       void init()
+       {
                OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleSecureList()
@@ -41,18 +42,18 @@ class ModuleSecureList : public Module
 
        virtual Version GetVersion()
        {
-               return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR);
+               return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
        }
 
        void OnRehash(User* user)
        {
-               ConfigReader MyConf;
                allowlist.clear();
 
-               for (int i = 0; i < MyConf.Enumerate("securehost"); i++)
-                       allowlist.push_back(MyConf.ReadValue("securehost", "exception", i));
+               ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
+                       allowlist.push_back(i->second->getString("exception"));
 
-               WaitTime = MyConf.ReadInteger("securelist", "waittime", "60", 0, true);
+               WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
        }