X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=6620dd13ac8e2aeee81b06c344da5d73dc1e8143;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=67a21a4844a1bd1f7b729851f6d9d07a8d85b1b3;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 67a21a484..6620dd13a 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -35,9 +35,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	 *      0    1    2    3    4    5        6        7     8        9       (n-1)
 	 * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
 	 */
-	if (params.size() < 10)
-		return CMD_INVALID;
-
 	time_t age_t = ConvToInt(params[1]);
 	time_t signon = ConvToInt(params[7]);
 	std::string empty;
@@ -60,14 +57,25 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
 
 	/* check for collision */
-	user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
+	User* const collideswith = ServerInstance->FindNickOnly(params[2]);
 
-	if (iter != ServerInstance->Users->clientlist->end())
+	if ((collideswith) && (collideswith->registered != REG_ALL))
+	{
+		// User that the incoming user is colliding with is not fully registered, we force nick change the
+		// unregistered user to their uuid and tell them what happened
+		collideswith->WriteFrom(collideswith, "NICK %s", collideswith->uuid.c_str());
+		collideswith->WriteNumeric(433, "%s %s :Nickname overruled.", collideswith->nick.c_str(), collideswith->nick.c_str());
+
+		// Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
+		collideswith->registered &= ~REG_NICK;
+		collideswith->ChangeNick(collideswith->uuid, true);
+	}
+	else if (collideswith)
 	{
 		/*
 		 * Nick collision.
 		 */
-		int collide = sock->DoCollision(iter->second, age_t, params[5], modestr, params[0]);
+		int collide = sock->DoCollision(collideswith, age_t, params[5], params[6], params[0]);
 		ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
 		if (collide != 1)
@@ -154,7 +162,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 		dosend = false;
 
 	if (dosend)
-		ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server.c_str(), _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
+		ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString(), _new->fullname.c_str());
 
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));
 
@@ -163,8 +171,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
 {
-	if (params.size() < 1)
-		return CMD_INVALID;
 	if (IS_SERVER(src))
 		return CMD_FAILURE;
 	src->ChangeDisplayedHost(params[0].c_str());
@@ -173,8 +179,6 @@ CmdResult CommandFHost::Handle(const parameterlist &params, User* src)
 
 CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
 {
-	if (params.size() < 1)
-		return CMD_INVALID;
 	if (IS_SERVER(src))
 		return CMD_FAILURE;
 	src->ChangeIdent(params[0].c_str());
@@ -183,8 +187,6 @@ CmdResult CommandFIdent::Handle(const parameterlist &params, User* src)
 
 CmdResult CommandFName::Handle(const parameterlist &params, User* src)
 {
-	if (params.size() < 1)
-		return CMD_INVALID;
 	if (IS_SERVER(src))
 		return CMD_FAILURE;
 	src->ChangeName(params[0].c_str());