Merge pull request #1093 from SaberUK/master+tsc

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / capab.cpp

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index f27fe8889f42611d9df7c211a4ca252c2a0b03a4..9035d89c9baa249e3609613f81bafb817e4b8b52 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -33,6 +33,11 @@ std::string TreeSocket::MyModules(int filter)
        std::string capabilities;
        for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
        {
+               // 2.2 advertises its settings for the benefit of services
+               // 2.0 would bork on this
+               if (proto_version < 1205 && i->second->ModuleSourceFile == "m_kicknorejoin.so")
+                       continue;
+
                Version v = i->second->GetVersion();
                if (!(v.Flags & filter))
                        continue;
@@ -386,8 +391,8 @@ bool TreeSocket::Capab(const parameterlist &params)
                        std::string::size_type equals = item.find('=');
                        if (equals != std::string::npos)
                        {
-                               std::string var = item.substr(0, equals);
-                               std::string value = item.substr(equals+1, item.length());
+                               std::string var(item, 0, equals);
+                               std::string value(item, equals+1);
                                capab->CapKeys[var] = value;
                        }
                }