Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 185df53757aaedc7a2a28510cecc61184b1ef6ed..0f1f04e99cfe99f8676e30ef5ad6c807fe1ee891 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -21,9 +21,8 @@
 class CommandSSLInfo : public Command
 {
  public:
-       CommandSSLInfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
+       CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1)
        {
-               this->source = "m_sslinfo.so";
                this->syntax = "<nick>";
        }
 
@@ -66,7 +65,7 @@ class ModuleSSLInfo : public Module
        CommandSSLInfo cmd;
  public:
        ModuleSSLInfo(InspIRCd* Me)
-               : Module(Me), cmd(Me)
+               : Module(Me), cmd(Me, this)
        {
                ServerInstance->AddCommand(&cmd);
 
@@ -84,6 +83,14 @@ class ModuleSSLInfo : public Module
                return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               if (target_type != TYPE_USER)
+                       return;
+               User* user = static_cast<User*>(item);
+               user->Shrink("ssl_cert");
+       }
+
        virtual void OnWhois(User* source, User* dest)
        {
                if(dest->GetExt("ssl"))
@@ -157,7 +164,7 @@ class ModuleSSLInfo : public Module
                return false;
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                irc::string pcmd = command.c_str();
 
@@ -205,7 +212,7 @@ class ModuleSSLInfo : public Module
                                if (SSLOnly && !user->GetExt("ssl"))
                                {
                                        user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
 
                                /*
@@ -216,13 +223,13 @@ class ModuleSSLInfo : public Module
                                        user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
                                        ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
                                        ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
 
                // Let core handle it for extra stuff
-               return 0;
+               return MOD_RES_PASSTHRU;
        }