Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 3786950910d4452ea5530d26426669d91bc424ea..7b64358980d6bb41e49dbadeee5b437ea327fd5b 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -37,12 +37,12 @@ std::string TreeSocket::MyModules(int filter)
 
        std::string capabilities;
        sort(modlist.begin(),modlist.end());
-       for (unsigned int i = 0; i < modlist.size(); i++)
+       for (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
        {
-               if (i)
+               if (i != modlist.begin())
                        capabilities.push_back(proto_version > 1201 ? ' ' : ',');
-               capabilities.append(modlist[i]);
-               Module* m = ServerInstance->Modules->Find(modlist[i]);
+               capabilities.append(*i);
+               Module* m = ServerInstance->Modules->Find(*i);
                if (m && proto_version > 1201)
                {
                        Version v = m->GetVersion();
@@ -157,6 +157,12 @@ void TreeSocket::SendCapabilities(int phase)
                        " PREFIX="+ServerInstance->Modes->BuildPrefixes()+
                        " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
                        " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+
+                       // XXX: Advertise the presence or absence of m_globops in CAPAB CAPABILITIES.
+                       // Services want to know about it, and since m_globops was not marked as VF_(OPT)COMMON
+                       // in 2.0, we advertise it here to not break linking to previous versions.
+                       // Protocol version 1201 (1.2) does not have this issue because we advertise m_globops
+                       // to 1201 protocol servers irrespectively of its module flags.
+                       (ServerInstance->Modules->Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0")+
                        " SVSPART=1");
 
        this->WriteLine("CAPAB END");
@@ -321,7 +327,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
                        {
                                this->SendCapabilities(2);
-                               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+                               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
                        }
                }
                else
@@ -330,7 +336,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        if (this->LinkState == CONNECTING)
                        {
                                this->SendCapabilities(2);
-                               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+                               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
                        }
                }