Add s2s backward compatability for protocol changes

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

diff --git a/src/commands/cmd_user.cpp b/src/commands/cmd_user.cpp
index e2777e8c8a7a8b7d15d202906bb0a3c0128f0eb9..b9ef94c97aecb6bcbc0e33f72a944c497c1f0f32 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -40,7 +40,7 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
                         * ~ character, and +1 for null termination, therefore we can safely use up to
                         * IDENTMAX here.
                         */
-                       user->ident.assign(parameters[0], 0, ServerInstance->Config->Limits.IdentMax);
+                       user->ChangeIdent(parameters[0].c_str());
                        user->fullname.assign(parameters[3].empty() ? std::string("No info") : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
                        user->registered = (user->registered | REG_USER);
                }
@@ -54,11 +54,11 @@ CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User
        /* parameters 2 and 3 are local and remote hosts, and are ignored */
        if (user->registered == REG_NICKUSER)
        {
-               int MOD_RESULT = 0;
+               ModResult MOD_RESULT;
 
                /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-               FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
-               if (MOD_RESULT > 0)
+               FIRST_MOD_RESULT(ServerInstance, OnUserRegister, MOD_RESULT, (user));
+               if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
 
        }