Rebuild clone counts on rehash

diff --git a/include/usermanager.h b/include/usermanager.h
index ac8ae1cb3ef1b82eb12a64756dfd06da1e737559..2a9d6b47b2b9ca54c893ba75a07bbe296a74f9e9 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -112,6 +112,10 @@ class CoreExport UserManager
         */
        void RemoveCloneCounts(User *user);
 
+       /** Rebuild clone counts
+        */
+       void RehashCloneCounts();
+
        /** Return the number of global clones of this user
         * @param user The user to get a count for
         * @return The global clone count of this user

diff --git a/src/configreader.cpp b/src/configreader.cpp
index b3caf8c7501146e7afdac5d80d0ed42c6f877234..bcee938d55208e1aefc3dcc5d0db93cf81820175 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -963,6 +963,7 @@ void ConfigReaderThread::Finish()
                 * XXX: The order of these is IMPORTANT, do not reorder them without testing
                 * thoroughly!!!
                 */
+               ServerInstance->Users->RehashCloneCounts();
                ServerInstance->XLines->CheckELines();
                ServerInstance->XLines->ApplyLines();
                ServerInstance->Res->Rehash();

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 1918b5c4c1cc43a985c13fc3880c376297f41045..76446c5b57fb07371adaa9b6730e6f335d7e0805 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -287,6 +287,22 @@ void UserManager::RemoveCloneCounts(User *user)
        }
 }
 
+void UserManager::RehashCloneCounts()
+{
+       local_clones.clear();
+       global_clones.clear();
+
+       const user_hash& hash = *ServerInstance->Users->clientlist;
+       for (user_hash::const_iterator i = hash.begin(); i != hash.end(); ++i)
+       {
+               User* u = i->second;
+
+               if (IS_LOCAL(u))
+                       AddLocalClone(u);
+               AddGlobalClone(u);
+       }
+}
+
 unsigned long UserManager::GlobalCloneCount(User *user)
 {
        clonemap::iterator x = global_clones.find(user->GetCIDRMask());