ident: rename ext to socket.

[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 f7431f1f2ccf2903a1cf52a4071a94ae9eaa3e21..6d9b64df25f2184705b5733d9517e08d82ae8d68 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -22,9 +22,11 @@
 #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;
 
@@ -36,15 +38,22 @@ class ModuleSecureList : public Module
 
        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);
        }
 
 
@@ -52,7 +61,7 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)