Remove users from uuidlist on QuitUser, not during cull (allows UID reuse on fast...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12326 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 8bb043f90bc642d9a20697301979f7263d3a1265..9f5f8c9378e45f50f280e8b6452b9cec4ba2e91b 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -242,6 +242,8 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                this->clientlist->erase(iter);
        else
                ServerInstance->Logs->Log("USERS", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+
+       ServerInstance->Users->uuidlist->erase(user->uuid);
 }
 
 

diff --git a/src/users.cpp b/src/users.cpp
index 73c4414372bee4adfabe901967feb17f829d720b..eea27f6f713f300fd27ab791616a90778540a99b 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -575,7 +575,6 @@ CullResult User::cull()
        if (client_sa.sa.sa_family != AF_UNSPEC)
                ServerInstance->Users->RemoveCloneCounts(this);
 
-       ServerInstance->Users->uuidlist->erase(uuid);
        return Extensible::cull();
 }