3rd time lucky? Fix again for setsockopt.

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 88c09d91cf52ecc37ac0aa3c77480554f8e67ad2..7a696035aa340c7c3e1afab756bbd2eae9b5cba9 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -21,7 +21,7 @@
 class BlockCaps : public SimpleChannelModeHandler
 {
  public:
-       BlockCaps(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'B') { }
+       BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { }
 };
 
 class ModuleBlockCAPS : public Module
@@ -32,7 +32,7 @@ class ModuleBlockCAPS : public Module
        char capsmap[256];
 public:
 
-       ModuleBlockCAPS(InspIRCd* Me) : Module(Me), bc(Me, this)
+       ModuleBlockCAPS() : bc(this)
        {
                OnRehash(NULL);
                if (!ServerInstance->Modes->AddMode(&bc))
@@ -60,7 +60,7 @@ public:
 
                        Channel* c = (Channel*)dest;
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'B') && c->GetPrefixValue(user) == OP_VALUE)
+                       if (CHANOPS_EXEMPT('B') && c->GetPrefixValue(user) == OP_VALUE)
                        {
                                return MOD_RES_PASSTHRU;
                        }
@@ -101,7 +101,7 @@ public:
 
        void ReadConf()
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
                minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true);
                std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0);
@@ -124,7 +124,6 @@ public:
 
        virtual ~ModuleBlockCAPS()
        {
-               ServerInstance->Modes->DelMode(&bc);
        }
 
        virtual Version GetVersion()