Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

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

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 3dff80fdf666b870362befd84263539dcacf248c..7fa9d4c10f4b3154dab0fcb61a39b373ddabdf54 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -25,10 +25,9 @@ class CommandLockserv : public Command
 {
        bool& locked;
 public:
-       CommandLockserv (InspIRCd* Instance, Module* Creator, bool& lock)
-               : Command(Instance, Creator, "LOCKSERV", "o", 0), locked(lock)
+       CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
        {
-               syntax.clear();
+               flags_needed = 'o'; syntax.clear();
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -37,7 +36,7 @@ public:
                user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
                /* Dont send to the network */
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
@@ -47,10 +46,9 @@ private:
        bool& locked;
 
 public:
-       CommandUnlockserv (InspIRCd* Instance, Module* Creator, bool &lock)
-               : Command(Instance, Creator, "UNLOCKSERV", "o", 0), locked(lock)
+       CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
        {
-               syntax.clear();
+               flags_needed = 'o'; syntax.clear();
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -59,7 +57,7 @@ public:
                user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
                /* Dont send to the network */
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
@@ -76,7 +74,7 @@ private:
        }
 
 public:
-       ModuleLockserv(InspIRCd* Me) : Module(Me), lockcommand(Me, this, locked), unlockcommand(Me, this, locked)
+       ModuleLockserv(InspIRCd* Me) : lockcommand(this, locked), unlockcommand(this, locked)
        {
                ResetLocked();
                ServerInstance->AddCommand(&lockcommand);