m_spanningtree Warn instead of sending SAVE if we change the nick of a non-local...

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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index e10781198dca3f080887f9898dd542ccb910c16b..ce13e5d2523a33cb9d7b0dfb57a983250514921e 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -59,20 +59,22 @@ namespace
 {
        void SetLocalUsersServer(Server* newserver)
        {
+               // Does not change the server of quitting users because those are not in the list
+
                ServerInstance->FakeClient->server = newserver;
-               const LocalUserList& list = ServerInstance->Users->local_users;
-               for (LocalUserList::const_iterator i = list.begin(); i != list.end(); ++i)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
                        (*i)->server = newserver;
        }
 
        void ResetMembershipIds()
        {
                // Set all membership ids to 0
-               const LocalUserList& list = ServerInstance->Users->local_users;
-               for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::iterator i = list.begin(); i != list.end(); ++i)
                {
                        LocalUser* user = *i;
-                       for (UCListIter j = user->chans.begin(); j != user->chans.end(); ++j)
+                       for (User::ChanList::iterator j = user->chans.begin(); j != user->chans.end(); ++j)
                                (*j)->id = 0;
                }
        }
@@ -419,11 +421,6 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
        return MOD_RES_DENY;
 }
 
-void ModuleSpanningTree::On005Numeric(std::map<std::string, std::string>& tokens)
-{
-       tokens["MAP"];
-}
-
 void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry)
 {
        if (IS_LOCAL(source))
@@ -607,12 +604,9 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
                params.push_back(ConvToStr(user->age));
                params.Broadcast();
        }
-       else if (!loopCall && user->nick == user->uuid)
+       else if (!loopCall)
        {
-               CmdBuilder params("SAVE");
-               params.push_back(user->uuid);
-               params.push_back(ConvToStr(user->age));
-               params.Broadcast();
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Changed nick of remote user %s from %s to %s TS %lu by ourselves!", user->uuid.c_str(), oldnick.c_str(), user->nick.c_str(), (unsigned long) user->age);
        }
 }
 
@@ -697,6 +691,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                return;
        ServerInstance->PI->SendMetaData("modules", "-" + mod->ModuleSourceFile);
 
+restart:
        // Close all connections which use an IO hook provided by this module
        const TreeServer::ChildServers& list = Utils->TreeRoot->GetChildren();
        for (TreeServer::ChildServers::const_iterator i = list.begin(); i != list.end(); ++i)
@@ -706,6 +701,8 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                {
                        sock->SendError("SSL module unloaded");
                        sock->Close();
+                       // XXX: The list we're iterating is modified by TreeSocket::Squit() which is called by Close()
+                       goto restart;
                }
        }