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 44d29cbbc2cd7382301ab16bf8523f2e450d3de6..38ca0c7e372348447596e869f1df5485452b71b8 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -67,11 +67,11 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
        }
        else
        {
-               char* mq = ServerInstance->XLines->matches_qline(parameters[0]);
+               QLine* mq = ServerInstance->XLines->matches_qline(parameters[0]);
                if (mq)
                {
-                       ServerInstance->SNO->WriteToSnoMask('x', "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])))
@@ -138,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)
        {