X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=518d600f19c956b2b0fe6f2c91c252f4559311cf;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=33960463b8b06fdf1cd5c5ce0e882a857b8f3927;hpb=e587b9efef09ca2cbb8873dd8cb2941ad74bda42;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 33960463b..518d600f1 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -61,7 +61,7 @@ extern chan_hash chanlist;
 extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -94,16 +94,23 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	}
 	if (irc::string(user->nick) == irc::string(parameters[0]))
 	{
+		/* If its exactly the same, even case, dont do anything. */
+		if (!strcmp(user->nick,parameters[0]))
+			return;
+		/* Its a change of case. People insisted that they should be
+		 * able to do silly things like this even though the RFC says
+		 * the nick AAA is the same as the nick aaa.
+		 */
 		log(DEBUG,"old nick is new nick, not updating hash (case change only)");
-		strlcpy(oldnick,user->nick,NICKMAX);
+		strlcpy(oldnick, user->nick, NICKMAX - 1);
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(OnUserPreNick(user,parameters[0]));
+		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT)
 			return;
-		strlcpy(user->nick,parameters[0],NICKMAX);
 		if (user->registered == 7)
 			WriteCommon(user,"NICK %s",parameters[0]);
-		FOREACH_MOD OnUserPostNick(user,oldnick);
+		strlcpy(user->nick, parameters[0], NICKMAX - 1);
+		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 		return;
 	}
 	else
@@ -136,7 +143,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (user->registered == 7)
 	{
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(OnUserPreNick(user,parameters[0]));
+		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT) {
 			// if a module returns true, the nick change is silently forbidden.
 			return;
@@ -146,7 +153,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 		
 	}
 
-	strlcpy(oldnick,user->nick,NICKMAX);
+	strlcpy(oldnick, user->nick, NICKMAX - 1);
 
 	/* change the nick of the user in the users_hash */
 	user = ReHashNick(user->nick, parameters[0]);
@@ -154,7 +161,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (!user) return;
 	if (!user->nick) return;
 
-	strlcpy(user->nick, parameters[0],NICKMAX);
+	strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
 	log(DEBUG,"new nick set: %s",user->nick);
 	
@@ -183,12 +190,12 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (user->registered == 3)
 	{
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		FOREACH_MOD OnUserRegister(user);
-		ConnectUser(user);
+		FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
+		//ConnectUser(user,NULL);
 	}
 	if (user->registered == 7)
 	{
-		FOREACH_MOD OnUserPostNick(user,oldnick);
+		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 	}
 }