Link m_ldap against libldap_r

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

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index ffc0a7e1151a87806a6161f39814c3c6e1857126..b81a285b574cab1ccd17af39f44f30c222f78b88 100644 (file)
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -104,10 +104,10 @@ void TreeSocket::DoBurst(TreeServer* s)
 {
        ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).",
                s->GetName().c_str(),
-               capab->auth_fingerprint ? "SSL Fingerprint and " : "",
+               capab->auth_fingerprint ? "SSL certificate fingerprint and " : "",
                capab->auth_challenge ? "challenge-response" : "plaintext password");
        this->CleanNegotiationInfo();
-       this->WriteLine(":" + ServerInstance->Config->GetSID() + " BURST " + ConvToStr(ServerInstance->Time()));
+       this->WriteLine(CmdBuilder("BURST").push_int(ServerInstance->Time()));
        /* Send server tree */
        this->SendServers(Utils->TreeRoot, s);
 
@@ -121,14 +121,16 @@ void TreeSocket::DoBurst(TreeServer* s)
 
        this->SendXLines();
        FOREACH_MOD(OnSyncNetwork, (bs.server));
-       this->WriteLine(":" + ServerInstance->Config->GetSID() + " ENDBURST");
+       this->WriteLine(CmdBuilder("ENDBURST"));
        ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
+
+       this->burstsent = true;
 }
 
 void TreeSocket::SendServerInfo(TreeServer* from)
 {
        // Send public version string
-       this->WriteLine(CmdBuilder(from->GetID(), "VERSION").push_last(from->GetVersion()));
+       this->WriteLine(CommandSInfo::Builder(from, "version", from->GetVersion()));
 
        // Send full version string that contains more information and is shown to opers
        this->WriteLine(CommandSInfo::Builder(from, "fullversion", from->GetFullVersion()));
@@ -139,7 +141,6 @@ void TreeSocket::SendServerInfo(TreeServer* from)
  * (and any of ITS servers too) of what servers we know about.
  * If at any point any of these servers already exist on the other
  * end, our connection may be terminated.
- * The hopcount parameter (3rd) is deprecated, and is always 0.
  */
 void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 {
@@ -167,9 +168,9 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s)
 void TreeSocket::SendFJoins(Channel* c)
 {
        CommandFJoin::Builder fjoin(c);
-       const UserMembList *ulist = c->GetUsers();
 
-       for (UserMembCIter i = ulist->begin(); i != ulist->end(); ++i)
+       const Channel::MemberMap& ulist = c->GetUsers();
+       for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
        {
                Membership* memb = i->second;
                if (!fjoin.has_room(memb))