diff options
| author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-11-27 14:17:41 +0000 |
|---|---|---|
| committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-11-27 14:17:41 +0000 |
| commit | fb07f6293eec3ecb9916dc30f9dcdc0ab92eedfb (patch) | |
| tree | 3eaf974bc6e32391b91e93f3924e51402d0c4204 | |
| parent | adf2b2c9996456222c164bc7e2499202b1950081 (diff) | |
Forward-port: Created commit fcadb0b: Change rm to force removal for configureclean target, obsoletes debian patch.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10829 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | .Makefile.inc | 10 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 11 |
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); } |