m_spanningtree When an IOHook goes away close all pending connections that use it

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

diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index e9ca3bfd0c0dc042f2a5b81466df755d977de252..719701d02beee2018aeaeef16d01d51c84d77dd1 100644 (file)
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -32,7 +32,7 @@ public:
        void init()
        {
                ServerInstance->Modules->Attach(I_OnPreMode, this);
-               ServerInstance->Extensions.Register(&this->mlock);
+               ServerInstance->Modules->AddService(this->mlock);
        }
 
        Version GetVersion()
@@ -54,17 +54,15 @@ public:
                        return MOD_RES_PASSTHRU;
 
                std::string *mlock_str = mlock.get(channel);
-               if (!mlock_str || mlock_str->empty())
+               if (!mlock_str)
                        return MOD_RES_PASSTHRU;
 
-               for (const char *modes = parameters[1].c_str(); *modes; modes++)
+               std::string::size_type p = parameters[1].find_first_of(*mlock_str);
+               if (p != std::string::npos)
                {
-                       if (mlock_str->find(*modes) != std::string::npos)
-                       {
-                               source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
-                                                    channel->name.c_str(), *modes, mlock_str->c_str());
-                               return MOD_RES_DENY;
-                       }
+                       source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
+                                            channel->name.c_str(), parameters[1][p], mlock_str->c_str());
+                       return MOD_RES_DENY;
                }
 
                return MOD_RES_PASSTHRU;