Some more text fixes and improvements (#1618).

[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 aa14707b1d1ad1a5f35b7cea1673d5ab5446d79a..e74134a3a764213c6f74abf1fd506acae9828441 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -22,29 +22,38 @@
 #include "inspircd.h"
 #include "modules/account.h"
 
+typedef std::vector<std::string> AllowList;
+
 class ModuleSecureList : public Module
 {
-       std::vector<std::string> allowlist;
+       AllowList allowlist;
        bool exemptregistered;
        unsigned int WaitTime;
 
  public:
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
+               return Version("Disallows the LIST command for recently connected clients to hinder spam bots", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               allowlist.clear();
+               AllowList newallows;
 
                ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
                for (ConfigIter i = tags.first; i != tags.second; ++i)
-                       allowlist.push_back(i->second->getString("exception"));
+               {
+                       std::string host = i->second->getString("exception");
+                       if (host.empty())
+                               throw ModuleException("<securehost:exception> is a required field at " + i->second->getTagLocation());
+                       newallows.push_back(host);
+               }
 
                ConfigTag* tag = ServerInstance->Config->ConfValue("securelist");
+
                exemptregistered = tag->getBool("exemptregistered");
                WaitTime = tag->getDuration("waittime", 60, 1);
+               allowlist.swap(newallows);
        }