ident over ipv6 fixes, and fixes to inspsocket BindAddr which wasnt doing ipv6 outbou...

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index c1a9de1a08baf8b9bb8180c70df4815b272e4a1b..4578b2a7603c868f83597d2329483b37418ba7db 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -87,8 +87,9 @@ int CullList::Apply()
 
                user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
                std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
+               const char* preset_reason = a->GetUser()->GetOperQuit();
                std::string reason = a->GetReason();
-               std::string oper_reason = a->GetOperReason();
+               std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
 
                if (reason.length() > MAXQUIT - 1)
                        reason.resize(MAXQUIT - 1);
@@ -101,7 +102,7 @@ int CullList::Apply()
 
                if (IS_LOCAL(a->GetUser()))
                {
-                       a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]", a->GetUser()->ident, a->GetUser()->host, oper_reason.c_str());
                        if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
                                a->GetUser()->FlushWriteBuf();
                }
@@ -110,7 +111,7 @@ int CullList::Apply()
                {
                        a->GetUser()->PurgeEmptyChannels();
                        a->GetUser()->WriteCommonQuit(reason, oper_reason);
-                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason));
+                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(), reason, oper_reason));
                }
 
                FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
@@ -140,9 +141,9 @@ int CullList::Apply()
                if (a->GetUser()->registered == REG_ALL)
                {
                        if (IS_LOCAL(a->GetUser()))
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
                        else
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
                        a->GetUser()->AddToWhoWas();
                }
 
@@ -163,3 +164,4 @@ int CullList::Apply()
        }
        return n;
 }
+