Merge guestpattern fix by peaveydk

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

diff --git a/src/users.cpp b/src/users.cpp
index c5199cb30eaad4ed3ecba0863d62ca0f0948c67c..796893be6ae593fc31a064a97c02bb8b4acf0766 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -281,10 +281,9 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
        
        for (unsigned int n = 0; n < MAXCHANS; n++)
        {
-               ucrec* x = new ucrec();
-               chans[n] = x;
-               x->channel = NULL;
-               x->uc_modes = 0;
+               chans[n] = new ucrec();
+               chans[n]->channel = NULL;
+               chans[n]->uc_modes = 0;
        }
 }
 
@@ -941,9 +940,11 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
        Instance->Log(DEBUG,"Push back to local users.");
        Instance->local_users.push_back(New);
 
-       Instance->Log(DEBUG,"Check softlimit.");
+       Instance->Log(DEBUG,"Check softlimit: %d %d %d",Instance->local_users.size(), Instance->Config->SoftLimit, MAXCLIENTS);
        if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS))
        {
+               Instance->Log(DEBUG,"Check softlimit failed");
+               Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
                userrec::QuitUser(Instance, New,"No more connections allowed");
                return;
        }
@@ -1132,8 +1133,11 @@ void userrec::FullConnect(CullList* Goners)
         * changes dont go out onto the network and produce 'fake direction'.
         */
        FOREACH_MOD(I_OnUserConnect,OnUserConnect(this));
-       FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
        this->registered = REG_ALL;
+
+       FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
+
        ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString());
 }