X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=124c4d140ece1f5d5e3a3640c62cb9200028118b;hb=dbc6dc90283220c06b4f4946cf0a131d2f965884;hp=b6a33d2c48c0f3eae4a1b7cbd11450a1161932d0;hpb=20ea635c9fcd0d559ff6fc2863ab581591bc4ef8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b6a33d2c4..124c4d140 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -73,7 +73,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	ServerInstance->Users->AddLocalClone(New);
 	ServerInstance->Users->AddGlobalClone(New);
 
-	this->local_users.push_back(New);
+	New->localuseriter = this->local_users.insert(local_users.end(), New);
 
 	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
 	{
@@ -147,6 +147,9 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		New->WriteServ("NOTICE Auth :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
 	FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
+	if (New->quitting)
+		return;
+
 	FOREACH_MOD(I_OnUserInit,OnUserInit(New));
 
 	if (ServerInstance->Config->NoUserDns)
@@ -346,7 +349,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 
 	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
-	for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
 		t->WriteServ(std::string(formatbuffer));
@@ -367,7 +370,7 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
 
 	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
-	for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
 		t->WriteServ(std::string(formatbuffer));