Merge pull request #1443 from B00mX0r/master+filtershun

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

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index b442dea9cf6c6b6f55e4f93bb87f8f08e8c30b01..f2da47f1bb63cb4d317b6c880112ab458550d423 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -140,7 +140,7 @@ class CommandCheck : public Command
                return ret;
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
                if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
                        return CMD_SUCCESS;
@@ -197,12 +197,10 @@ class CommandCheck : public Command
                                        context.Write("modeperms", "user=" + umodes + " channel=" + cmodes);
 
                                        CheckContext::List opcmdlist(context, "commandperms");
-                                       for (OperInfo::PrivSet::const_iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); ++i)
-                                               opcmdlist.Add(*i);
+                                       opcmdlist.Add(oper->AllowedOperCommands.ToString());
                                        opcmdlist.Flush();
                                        CheckContext::List privlist(context, "permissions");
-                                       for (OperInfo::PrivSet::const_iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); ++i)
-                                               privlist.Add(*i);
+                                       opcmdlist.Add(oper->AllowedPrivs.ToString());
                                        privlist.Flush();
                                }
                        }
@@ -303,7 +301,7 @@ class CommandCheck : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
        {
                if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[1]);