Make irc::spacify take 'const char*' instead of 'char*'

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index a2337ba088f679aa9ab2039dc4db8b51b0128713..7801a200fdd6a51fd1cfd7ff7e1bb6a04569952a 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -67,11 +64,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->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])))
@@ -138,6 +135,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)
        {