httpd connection close fixes (these need to be backported to 1.1 at some point?)...

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

diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index f82537c95de5f863003fe5116a81d1e09d23fff2..34d9478165baffc5ee7bf1b2e0f6331a39a9ac99 100644 (file)
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -33,7 +33,7 @@ class cmd_fingerprint : public Command
                syntax = "<nickname>";
        }       
                  
-       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]);
                if (target)
@@ -60,7 +60,7 @@ class cmd_fingerprint : public Command
                }
                else
                {
-                       user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such nickname", user->nick, parameters[0].c_str());
                        return CMD_FAILURE;
                }
        }
@@ -112,7 +112,7 @@ class ModuleOperSSLCert : public Module
                return false;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                irc::string cmd = command.c_str();
                
@@ -146,20 +146,20 @@ class ModuleOperSSLCert : public Module
 
                                if (SSLOnly || !FingerPrint.empty())
                                {
-                                       if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1], HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
+                                       if ((!strcmp(LoginName.c_str(),parameters[0].c_str())) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
                                        {
                                                if (SSLOnly && !user->GetExt("ssl", dummy))
                                                {
-                                                       user->WriteServ("491 %s :This oper login name requires an SSL connection.", user->nick);
+                                                       user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick);
                                                        return 1;
                                                }
 
                                                /* This oper would match */
                                                if ((!cert) || (cert->GetFingerprint() != FingerPrint))
                                                {
-                                                       user->WriteServ("491 %s :This oper login name requires a matching key fingerprint.",user->nick);
+                                                       user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick);
                                                        ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick);
-                                                       ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host);
+                                                       ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host);
                                                        return 1;
                                                }
                                        }
@@ -171,7 +171,7 @@ class ModuleOperSSLCert : 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);
        }
 };