Fix this not working.

[user/henk/code/inspircd.git] / src / cmd_nick.cpp

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 4b3317a9fe0bb51a54697584d6b96b3c4af7d5a8..64b1a466681f5062380d2dfc748115e673e2949b 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -29,17 +29,12 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char oldnick[NICKMAX];
 
-       if (!parameters[0][0])
-       {
-               ServerInstance->Log(DEBUG,"zero length new nick passed to handle_nick");
+       if (!*parameters[0])
                return CMD_FAILURE;
-       }
+
        if (!*user->nick)
-       {
-               ServerInstance->Log(DEBUG,"invalid old nick passed to handle_nick");
                return CMD_FAILURE;
-       }
-       ServerInstance->Log(DEBUG,"Fall through");
+
        if (irc::string(user->nick) == irc::string(parameters[0]))
        {
                /* If its exactly the same, even case, dont do anything. */
@@ -50,12 +45,12 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                 * able to do silly things like this even though the RFC says
                 * the nick AAA is the same as the nick aaa.
                 */
-               ServerInstance->Log(DEBUG,"old nick is new nick, not updating hash (case change only)");
                strlcpy(oldnick, user->nick, NICKMAX - 1);
                int MOD_RESULT = 0;
                FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
                if (MOD_RESULT)
                        return CMD_FAILURE;
+               user->InvalidateCache();
                if (user->registered == REG_ALL)
                        user->WriteCommon("NICK %s",parameters[0]);
                strlcpy(user->nick, parameters[0], NICKMAX - 1);
@@ -80,7 +75,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+                               user->WriteServ("433 %s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]);
                                return CMD_FAILURE;
                        }
                }
@@ -117,29 +112,29 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
        user->InvalidateCache();
 
-       ServerInstance->Log(DEBUG,"new nick set: %s",user->nick);
-       
        if (user->registered < REG_NICKUSER)
        {
                user->registered = (user->registered | REG_NICK);
-               // dont attempt to look up the dns until they pick a nick... because otherwise their pointer WILL change
-               // and unless we're lucky we'll get a duff one later on.
-               //user->dns_done = (!lookup_dns(user->nick));
-               //if (user->dns_done)
-               //      ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
 
                if (ServerInstance->Config->NoUserDns)
                {
                        user->dns_done = true;
+                       ServerInstance->next_call = ServerInstance->Time();
                }
                else
                {
                        user->StartDNSLookup();
                        if (user->dns_done)
-                               ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
+                       {
+                               /* Cached result or instant failure - fall right through if possible */
+                               ServerInstance->next_call = ServerInstance->Time();
+                       }
+                       else
+                       {
+                               if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
+                                       ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
+                       }
                }
-               if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
-                       ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
        }
        if (user->registered == REG_NICKUSER)
        {