X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=a171c32d203aec7ae4cafc8712aea2b95941bc4d;hb=7e4b66804044616a85d5049cbfdb88efa012cc51;hp=aaf512019399c9838f95cb7ec67690dafd5f7f04;hpb=6d6f0ef3c67974e14cc226a442e09b2d0cb37146;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index aaf512019..a171c32d2 100644
--- 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, NICKMAX - 1);
 
 	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,6 +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.c_str());
 		New->dns_done = true;
 	}
 	else
@@ -191,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;
 
@@ -376,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);
 			}
 		}
 	}
@@ -398,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);
 			}
 		}
 	}