Move some stuff around so the last penalty line doesnt get held erroneously until...

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 42e70c1df4ca988e1a4113201acec65001ed0a63..740674833042e5d483b9e855783a2ae7f246a0c4 100644 (file)
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -14,12 +14,12 @@
 #include "inspircd.h"
 #include "commands/cmd_user.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new cmd_user(Instance);
 }
 
-CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_user::Handle (const char** parameters, int pcnt, User *user)
 {
        /* A user may only send the USER command once */
        if (!(user->registered & REG_USER))
@@ -55,9 +55,8 @@ CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
        if (user->registered == REG_NICKUSER)
        {
                int MOD_RESULT = 0;
+
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-               if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
-                       ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
                FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
                if (MOD_RESULT > 0)
                        return CMD_FAILURE;