Add sanity checks to the ssl modules so that theres no possibility of an out of range...

[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 2f5807c53c774360345645d79631bb3bf2047050..893981283bf01f29a4abe2bf4f2df0f7a966ce04 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
 
 /* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */
 
@@ -109,22 +105,22 @@ public:
        {
                ConfigReader Conf(ServerInstance);
                percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
-               minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true);
+               minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true);
                std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0);
                if (hmap.empty())
                        hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
                memset(&capsmap, 0, 255);
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
                        capsmap[(unsigned char)*n] = 1;
-               if (percent < 0 || percent > 100)
+               if (percent < 1 || percent > 100)
                {
                        ServerInstance->Log(DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
                        percent = 100;
                }
-               if (minlen < 0 || minlen > MAXBUF-1)
+               if (minlen < 1 || minlen > MAXBUF-1)
                {
-                       ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 0.");
-                       minlen = 0;
+                       ServerInstance->Log(DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+                       minlen = 1;
                }
        }
 
@@ -140,27 +136,4 @@ public:
        }
 };
 
-
-class ModuleBlockCAPSFactory : public ModuleFactory
-{
- public:
-       ModuleBlockCAPSFactory()
-       {
-       }
-       
-       ~ModuleBlockCAPSFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBlockCAPS(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBlockCAPSFactory;
-}
+MODULE_INIT(ModuleBlockCAPS)