Allow channels/auspex to see a secret channel topic. (#1654)

[user/henk/code/inspircd.git] / src / coremods / core_oper / cmd_oper.cpp

diff --git a/src/coremods/core_oper/cmd_oper.cpp b/src/coremods/core_oper/cmd_oper.cpp
index 9c06583a8a7f595481c3ab09204d00dcfcc8d499..8c3c86adc4df74d2af589ad3830b3e67dc9c4066 100644 (file)
--- a/src/coremods/core_oper/cmd_oper.cpp
+++ b/src/coremods/core_oper/cmd_oper.cpp
@@ -28,13 +28,13 @@ CommandOper::CommandOper(Module* parent)
        syntax = "<username> <password>";
 }
 
-CmdResult CommandOper::HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)
+CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
 {
        bool match_login = false;
        bool match_pass = false;
        bool match_hosts = false;
 
-       const std::string userHost = user->ident + "@" + user->host;
+       const std::string userHost = user->ident + "@" + user->GetRealHost();
        const std::string userIP = user->ident + "@" + user->GetIPString();
 
        ServerConfig::OperIndex::const_iterator i = ServerInstance->Config->oper_blocks.find(parameters[0]);
@@ -67,6 +67,5 @@ CmdResult CommandOper::HandleLocal(const std::vector<std::string>& parameters, L
        user->CommandFloodPenalty += 10000;
 
        ServerInstance->SNO->WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': The following fields do not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str());
-       ServerInstance->Logs->Log("OPER", LOG_DEFAULT, "OPER: Failed oper attempt by %s using login '%s': The following fields did not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str());
        return CMD_FAILURE;
 }