From: Attila Molnar <attilamolnar@hush.com>
Date: Wed, 24 Feb 2016 11:40:05 +0000 (+0100)
Subject: Fix some numerics
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=55e5e41fb9e9983c72f144fb4f59684d2125e129;p=user%2Fhenk%2Fcode%2Finspircd.git

Fix some numerics
---

diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp
index e2fdd7877..44f511bc1 100644
--- 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 689189229..8b06118ee 100644
--- 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 d7c97c835..6e3086930 100644
--- 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());