summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Makefile.inc10
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp11
2 files changed, 16 insertions, 5 deletions
diff --git a/.Makefile.inc b/.Makefile.inc
index 87114ca6a..be8d9111b 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -110,11 +110,11 @@ launchd_dir:
configureclean:
rm -f .config.cache
- rm src/modules/Makefile
- rm src/Makefile
- rm Makefile
- rm include/inspircd_config.h
- rm include/inspircd_se_config.h
+ rm -f src/modules/Makefile
+ rm -f src/Makefile
+ rm -f Makefile
+ rm -f include/inspircd_config.h
+ rm -f include/inspircd_se_config.h
distclean: modclean clean configureclean
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 3ad9b3227..f35d3f6a5 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -486,7 +486,18 @@ bool TreeSocket::ProcessLine(std::string &line)
{
if (params.size() >= 2)
{
+ std::string oldprefix;
+ if (!ServerSource)
+ {
+ oldprefix = prefix;
+ User *u = ServerInstance->FindNick(prefix);
+ if (!u)
+ return true;
+ prefix = u->nick;
+ }
+
ServerInstance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
+ prefix = oldprefix;
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}