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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 4e2c4936c..05a66cbfc 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -33,7 +33,11 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 	char oldnick[NICKMAX];
 
 	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]))
 	{
@@ -160,7 +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));
+		int MOD_RESULT = 0;
+		FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
+		if (MOD_RESULT > 0)
+			return CMD_FAILURE;
 	}
 	if (user->registered == REG_ALL)
 	{