summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/m_spanningtree/kill.cpp3
-rw-r--r--src/modules/m_spanningtree/uid.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp
index b8413942d..93bed9bbe 100644
--- a/src/modules/m_spanningtree/kill.cpp
+++ b/src/modules/m_spanningtree/kill.cpp
@@ -35,7 +35,8 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &
/* Prepend kill source, if we don't have one */
if (*(params[1].c_str()) != '[')
{
- params[1] = "[" + prefix + "] Killed (" + params[1] +")";
+ TreeServer* ts = Utils->FindServer(prefix);
+ params[1] = "[" + (ts ? ts->GetName() : prefix) + "] Killed (" + params[1] +")";
}
std::string reason = params[1];
params[1] = ":" + params[1];
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 0c4564719..3e76c9725 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -40,7 +40,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
{
if (!params.empty())
this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+
- ConvToStr(params.size())+" of 10 parameters?)");
+ ConvToStr(params.size())+" of 11 parameters?)");
return true;
}