X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=05a66cbfc5a0b86f372b2744f84d0887de3abf46;hb=187ece1bab24da3e9fda31053aaa04c5e4c401f9;hp=76ac00bb59d1f1f2c3316782b7fe07ee03e7f9cb;hpb=4be6c8212d619b3a61418300f9d2a8ca917c8e02;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 76ac00bb5..05a66cbfc 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -18,22 +18,26 @@
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
-
-
 extern "C" command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_nick(Instance);
 }
 
+/** Handle nick changes from users.
+ * NOTE: If you are used to ircds based on ircd2.8, and are looking
+ * for the client introduction code in here, youre in the wrong place.
+ * You need to look in the spanningtree module for this!
+ */
 CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char oldnick[NICKMAX];
 
-	if (!*parameters[0])
-		return CMD_FAILURE;
-
-	if (!*user->nick)
+	if (!*parameters[0] || !*user->nick)
+	{
+		/* We cant put blanks in the parameters, so for this (extremely rare) issue we just put '*' here. */
+		user->WriteServ("432 %s * :Erroneous Nickname", *user->nick ? user->nick : "*");
 		return CMD_FAILURE;
+	}
 
 	if (irc::string(user->nick) == irc::string(parameters[0]))
 	{
@@ -66,20 +70,33 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0], mq->reason);
 			return CMD_FAILURE;
 		}
-		if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user) && (ServerInstance->IsNick(parameters[0])))
+		/* Check for nickname overruled -
+		 * This happens when one user has connected and sent only NICK, and is essentially
+		 * "camping" upon a nickname. To give the new user connecting a fair chance of having
+		 * the nickname too, we force a nickchange on the older user (Simply the one who was
+		 * here first, no TS checks need to take place here)
+		 */
+		userrec* InUse = ServerInstance->FindNick(parameters[0]);
+		if (InUse && (InUse != user) && (ServerInstance->IsNick(parameters[0])))
 		{
-			userrec* InUse = ServerInstance->FindNick(parameters[0]);
 			if (InUse->registered != REG_ALL)
 			{
 				/* change the nick of the older user to nnn-overruled,
 				 * where nnn is their file descriptor. We know this to be unique.
+				 * NOTE: We must do this and not quit the user, even though we do
+				 * not have UID support yet. This is because if we set this user
+				 * as quitting and then introduce the new user before the old one
+				 * has quit, then the user hash gets totally buggered.
+				 * (Yes, that is a technical term). -- Brain
 				 */
 				std::string changeback = ConvToStr(InUse->GetFd()) + "-overruled";
-				InUse->WriteFrom("NICK %s", changeback.c_str());
+				InUse->WriteTo(InUse, "NICK %s", changeback.c_str());
 				InUse->WriteServ("433 %s %s :Nickname overruled.", InUse->nick, InUse->nick);
 				InUse->UpdateNickHash(changeback.c_str());
 				strlcpy(InUse->nick, changeback.c_str(), NICKMAX - 1);
 				InUse->InvalidateCache();
+				/* Take away their nickname-sent state forcing them to send a nick again */
+				InUse->registered &= ~REG_NICK;
 			}
 			else
 			{
@@ -147,8 +164,10 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 	if (user->registered == REG_NICKUSER)
 	{
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
-		//ConnectUser(user,NULL);
+		int MOD_RESULT = 0;
+		FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
+		if (MOD_RESULT > 0)
+			return CMD_FAILURE;
 	}
 	if (user->registered == REG_ALL)
 	{