Add irc::dynamicbitmask class. Feel free to take a look and offer suggestions, as...

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 10d95ed469696835c39284b6be0aa8e10052910f..38ca0c7e372348447596e869f1df5485452b71b8 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -32,7 +32,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char oldnick[NICKMAX];
 
-       if (!*parameters[0])
+       if (!parameters[0][0])
        {
                ServerInstance->Log(DEBUG,"zero length new nick passed to handle_nick");
                return CMD_FAILURE;
@@ -42,11 +42,13 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                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. */
                if (!strcmp(user->nick,parameters[0]))
                        return CMD_SUCCESS;
+
                /* 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.
@@ -65,15 +67,11 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
        }
        else
        {
-               if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0))
-               {
-                       parameters[0]++;
-               }
-               char* mq = ServerInstance->XLines->matches_qline(parameters[0]);
+               QLine* mq = ServerInstance->XLines->matches_qline(parameters[0]);
                if (mq)
                {
-                       ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,mq);
-                       user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0],mq);
+                       ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0], user->nick, user->ident, user->host, mq->reason);
+                       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])))
@@ -140,6 +138,8 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        if (user->dns_done)
                                ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
                }
+               if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
+                       ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
        }
        if (user->registered == REG_NICKUSER)
        {