First phase of conversion to dynamic limits on all the lengths, configured via the...

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 139ccb4c482d505c29e719ca6205b1107747d3a1..73096d4a84e477c04cdd15aac06c1bbde3c8c1e6 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -63,27 +63,23 @@ 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 */
-       strlcpy(New->nick, New->uuid, NICKMAX - 1);
+       New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
 
        New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
-       /* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
-       strcpy(New->ident, "unknown");
+       New->ident.assign("unknown");
 
        New->registered = REG_NONE;
        New->signon = Instance->Time() + Instance->Config->dns_timeout;
        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);
@@ -145,7 +141,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
                        /* user banned */
                        Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
                        if (*Instance->Config->MoronBanner)
-                               New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
+                               New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner);
                        this->QuitUser(New, b->Reason);
                        return;
                }
@@ -181,7 +177,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
        if (Instance->Config->NoUserDns)
        {
-               New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick);
+               New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
                New->dns_done = true;
        }
        else
@@ -192,8 +188,8 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
 {
-       ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
-       user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
+       ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str());
+       user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
        user->quietquit = false;
        user->quitmsg = quitreason;
 
@@ -377,7 +373,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
                        }
                        if (send_to_user)
                        {
-                               t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+                               t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
                        }
                }
        }
@@ -399,7 +395,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 
                        if (send_to_user)
                        {
-                               t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+                               t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
                        }
                }
        }