Move all local-only fields to LocalUser

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index db2b3a75c56b8ff377a5eb8bf6ce12fed4ad9fbd..2d824c6b2ff188417a971ec57f54fd57ecebe26c 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -81,13 +81,7 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
         * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved.
         * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t
         */
-       ConnectClass* i = New->SetClass();
-
-       if (!i)
-       {
-               this->QuitUser(New, "Access denied by configuration");
-               return;
-       }
+       New->SetClass();
 
        /*
         * Check connect class settings and initialise settings into User.
@@ -198,14 +192,13 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
                user->WriteCommonQuit(reason, oper_reason);
        }
 
-       FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
-
        if (user->registered != REG_ALL)
                if (ServerInstance->Users->unregistered_count)
                        ServerInstance->Users->unregistered_count--;
 
        if (IS_LOCAL(user))
        {
+               FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(IS_LOCAL(user)));
                user->DoWrite();
                if (user->GetIOHook())
                {