Fix <options:noservices> causing +o (and +q!) not being correctly given on channel...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index ddbf6acae8e7d12980c3efeb8a5f69e2418d92d2..bfbe518cbbb0b781c09bd0f23979b03e5711a6a6 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcull_list */
+/* $Core */
 
 #include "inspircd.h"
 #include "cull_list.h"
@@ -54,8 +54,8 @@ int CullList::Apply()
                std::string reason;
                std::string oper_reason;
 
-               reason.assign(u->quitmsg, 0, MAXQUIT - 1);
-               oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, MAXQUIT - 1);
+               reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
+               oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
 
                if (u->registered != REG_ALL)
                        if (ServerInstance->Users->unregistered_count)
@@ -63,7 +63,7 @@ int CullList::Apply()
 
                if (IS_LOCAL(u))
                {
-                       if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+                       if (!u->sendq.empty())
                                u->FlushWriteBuf();
                }
 
@@ -78,11 +78,11 @@ int CullList::Apply()
 
                if (IS_LOCAL(u))
                {
-                       if (u->io)
+                       if (u->GetIOHook())
                        {
                                try
                                {
-                                       u->io->OnRawSocketClose(u->GetFd());
+                                       u->GetIOHook()->OnRawSocketClose(u->GetFd());
                                }
                                catch (CoreException& modexcept)
                                {