Fix for bug #541: /taxonomy reporting metadata for incorrect user. Can someone please...

[user/henk/code/inspircd.git] / src / usermanager.cpp

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index f18ea91d4c6651d7902b51b8cfd7f571629101f4..73096d4a84e477c04cdd15aac06c1bbde3c8c1e6 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -63,14 +63,12 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
        Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
 
-       int j = 0;
-
        this->unregistered_count++;
 
        (*(this->clientlist))[New->uuid] = New;
 
        /* The users default nick is their UUID */
-       New->nick.assign(New->uuid, 0, NICKMAX - 1);
+       New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
 
        New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
        New->ident.assign("unknown");
@@ -80,9 +78,8 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
        New->lastping = 1;
 
        /* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-       for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
-               New->dhost[j] = New->host[j] = *temp;
-       New->dhost[j] = New->host[j] = 0;
+       New->dhost.assign(New->GetIPString(), 0, 64);
+       New->host.assign(New->GetIPString(), 0, 64);
 
        Instance->Users->AddLocalClone(New);
        Instance->Users->AddGlobalClone(New);