Fix memory leak if we send STARTTLS twice, thanks special and psychon

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

diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index 2c28cf5d07a0b38f6f26c8148f4876f33377cdcf..6c74b15d442af9df894321c6c6fb137712731664 100644 (file)
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -33,7 +33,7 @@ class cmd_sslinfo : public Command
                this->syntax = "<nick>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                User* target = ServerInstance->FindNick(parameters[0]);
                ssl_cert* cert;
@@ -44,21 +44,21 @@ class cmd_sslinfo : public Command
                        {
                                if (cert->GetError().length())
                                {
-                                       user->WriteServ("NOTICE %s :*** Error:             %s", user->nick, cert->GetError().c_str());
+                                       user->WriteServ("NOTICE %s :*** Error:             %s", user->nick.c_str(), cert->GetError().c_str());
                                }
-                               user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick, cert->GetDN().c_str());
-                               user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick, cert->GetIssuer().c_str());
-                               user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick, cert->GetFingerprint().c_str());
+                               user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick.c_str(), cert->GetDN().c_str());
+                               user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick.c_str(), cert->GetIssuer().c_str());
+                               user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick.c_str(), cert->GetFingerprint().c_str());
                                return CMD_SUCCESS;
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :*** No SSL certificate information for this user.", user->nick);
+                               user->WriteServ("NOTICE %s :*** No SSL certificate information for this user.", user->nick.c_str());
                                return CMD_FAILURE;
                        }
                }
                else
-                       user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
 
                return CMD_FAILURE;
        }
@@ -77,9 +77,6 @@ class ModuleSSLInfo : public Module
 
        }
 
-       void Implements(char* List)
-       {
-       }
 
        virtual ~ModuleSSLInfo()
        {
@@ -87,7 +84,7 @@ class ModuleSSLInfo : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };