Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

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

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index ef63b2511733b8369155b2a3678989acaf9357e8..c81c7420783747b7d0d560b475224a5a5a925a5c 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -83,10 +83,13 @@ class ModuleSSLModes : public Module
        ModuleSSLModes()
                : sslm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&sslm))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(sslm);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -113,7 +116,7 @@ class ModuleSSLModes : public Module
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (mask[0] == 'z' && mask[1] == ':')
+               if ((mask.length() > 2) && (mask[0] == 'z') && (mask[1] == ':'))
                {
                        UserCertificateRequest req(user, this);
                        req.Send();