Fix some numerics

diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp
index e2fdd787797d7a2819a66a83252923ea81758bc0..44f511bc1196554097ab95d1c68bf1a66e9effde 100644 (file)
--- a/src/coremods/core_channel/cmd_kick.cpp
+++ b/src/coremods/core_channel/cmd_kick.cpp
@@ -111,7 +111,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
                        if (them < req)
                        {
                                user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
-                                       this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
+                                       c->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
                                return CMD_FAILURE;
                        }
                }

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 689189229c8ed80b7d542199607aa9ede2037cd5..8b06118ee536f05b9a152879193cca98634209cc 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -42,7 +42,7 @@ class CommandSamode : public Command
                        User* target = ServerInstance->FindNickOnly(parameters[0]);
                        if ((!target) || (target->registered != REG_ALL))
                        {
-                               user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
+                               user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
                                return CMD_FAILURE;
                        }
 

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index d7c97c835b0f8579c6d741a030e0c7cb2676c5e1..6e308693073ec727f7b84ef2cad36c380ff8e34d 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -142,7 +142,7 @@ class SaslAuthenticator
                                this->result = this->GetSaslResult(msg[3]);
                        }
                        else if (msg[2] == "M")
-                               this->user->WriteNumeric(908, "%s %s :are available SASL mechanisms", this->user->nick.c_str(), msg[3].c_str());
+                               this->user->WriteNumeric(908, "%s :are available SASL mechanisms", msg[3].c_str());
                        else
                                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str());