Update wiki links to use HTTPS and point to the correct pages.

[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 22be27383e6c84282775f8460a7ec6e57e558bb1..083ac0f0448486a212bfc53ad61adfc57a3389ed 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -91,7 +91,7 @@ class CommandSSLInfo : public Command
        {
                User* target = ServerInstance->FindNickOnly(parameters[0]);
 
-               if (!target)
+               if ((!target) || (target->registered != REG_ALL))
                {
                        user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
@@ -132,12 +132,12 @@ class ModuleSSLInfo : public Module
 
        void init()
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
 
-               ServerInstance->Extensions.Register(&cmd.CertExt);
+               ServerInstance->Modules->AddService(cmd.CertExt);
 
                Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect, I_OnPostConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion()
@@ -174,14 +174,15 @@ class ModuleSSLInfo : public Module
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
-               irc::string pcmd = command.c_str();
-
-               if ((pcmd == "OPER") && (validated))
+               if ((command == "OPER") && (validated))
                {
                        OperIndex::iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]);
                        if (i != ServerInstance->Config->oper_blocks.end())
                        {
                                OperInfo* ifo = i->second;
+                               if (!ifo->oper_block)
+                                       return MOD_RES_PASSTHRU;
+
                                ssl_cert* cert = cmd.CertExt.get(user);
 
                                if (ifo->oper_block->getBool("sslonly") && !cert)
@@ -222,6 +223,9 @@ class ModuleSSLInfo : public Module
                for(OperIndex::iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); i++)
                {
                        OperInfo* ifo = i->second;
+                       if (!ifo->oper_block)
+                               continue;
+
                        std::string fp = ifo->oper_block->getString("fingerprint");
                        if (fp == cert->fingerprint && ifo->oper_block->getBool("autologin"))
                                user->Oper(ifo);